You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2012/01/10 21:47:48 UTC
[3/3] Upgrade Thrift to 0.7.0
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
index 7062415..2e7d892 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -68,28 +68,28 @@ public class CfDef implements org.apache.thrift.TBase<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);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
index 0a27d33..d655124 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -57,10 +57,10 @@ public class Column implements org.apache.thrift.TBase<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();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java
index b31b255..37d8db6 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -51,15 +51,15 @@ public class ColumnDef implements org.apache.thrift.TBase<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);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java
index a689e34..2b7f185 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -65,10 +65,10 @@ public class ColumnOrSuperColumn implements org.apache.thrift.TBase<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 {
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java
index 4a27d0c..40ee56d 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -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 {
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java
index bfe6946..c25e238 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -59,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 {
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/Compression.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/Compression.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/Compression.java
index 91df1eb..453a8a2 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Compression.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/Compression.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java
index e6985cf..2f4cf50 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
index 15ad1f1..9c8ab64 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterColumn.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterColumn.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterColumn.java
index 50a55bf..7d90872 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterColumn.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterColumn.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -48,8 +48,8 @@ public class 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();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterSuperColumn.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterSuperColumn.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterSuperColumn.java
index 4af3ef0..ce15984 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterSuperColumn.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterSuperColumn.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -48,8 +48,8 @@ public class 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);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlMetadata.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlMetadata.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlMetadata.java
index f3627e3..f7df6b6 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlMetadata.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlMetadata.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -50,10 +50,10 @@ public class CqlMetadata implements org.apache.thrift.TBase<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);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlPreparedResult.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlPreparedResult.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlPreparedResult.java
index 15f4be3..122449c 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlPreparedResult.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlPreparedResult.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -48,8 +48,8 @@ public class CqlPreparedResult implements org.apache.thrift.TBase<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();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
index 824f978..7c0129f 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -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);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java
index 07e5032..09c37b2 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
index ea2fb9b..df7ec85 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -51,8 +51,8 @@ public class CqlRow implements org.apache.thrift.TBase<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);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java
index e36f180..180a2b3 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -52,9 +52,9 @@ public class Deletion implements org.apache.thrift.TBase<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();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/EndpointDetails.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/EndpointDetails.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/EndpointDetails.java
index 2da7275..125b159 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/EndpointDetails.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/EndpointDetails.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -49,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 {
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java
index 6f3d5d2..1fcebf0 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -52,9 +52,9 @@ public class 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);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java
index 7083391..43b89a8 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -49,13 +49,13 @@ public class IndexExpression implements org.apache.thrift.TBase<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 {
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexOperator.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexOperator.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexOperator.java
index 168671f..c5d29e3 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexOperator.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexOperator.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexType.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexType.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexType.java
index b5638b3..a351bd7 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexType.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexType.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
index fe73c52..7ee266b 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -51,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 {
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyCount.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyCount.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyCount.java
index 961cc2c..30f194e 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyCount.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyCount.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -48,8 +48,8 @@ public class 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();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java
index 60e3b79..585d40e 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -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);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java
index 9d7e305..a13c8e0 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -55,8 +55,8 @@ public class KeySlice implements org.apache.thrift.TBase<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);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
index 89ff25a..f721a04 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -52,15 +52,15 @@ public class KsDef implements org.apache.thrift.TBase<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);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java
index 1d1553d..f267d4b 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -53,8 +53,8 @@ public class Mutation implements org.apache.thrift.TBase<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 {
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
index 5cc630a..b05d38c 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java
index 52f3730..9d405fc 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java
index 93fe5d9..671e3d0 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -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);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java
index b1243d3..d66ce58 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -66,10 +66,10 @@ public class SliceRange implements org.apache.thrift.TBase<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();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
index 0ff5e01..776fede 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -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);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java
index bf0b329..ea1d648 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java
index 9f7922c..bcf5726 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -59,11 +59,11 @@ public class TokenRange implements org.apache.thrift.TBase<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);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java
index 0b60205..da4d7a0 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/lib/libthrift-0.6.jar
----------------------------------------------------------------------
diff --git a/lib/libthrift-0.6.jar b/lib/libthrift-0.6.jar
deleted file mode 100644
index 0d91fe1..0000000
Binary files a/lib/libthrift-0.6.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/lib/libthrift-0.7.0.jar
----------------------------------------------------------------------
diff --git a/lib/libthrift-0.7.0.jar b/lib/libthrift-0.7.0.jar
new file mode 100644
index 0000000..a0cc175
Binary files /dev/null and b/lib/libthrift-0.7.0.jar differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/lib/licenses/libthrift-0.5.txt
----------------------------------------------------------------------
diff --git a/lib/licenses/libthrift-0.5.txt b/lib/licenses/libthrift-0.5.txt
deleted file mode 100644
index d645695..0000000
--- a/lib/licenses/libthrift-0.5.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- 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.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c8c5704/lib/licenses/libthrift-0.7.txt
----------------------------------------------------------------------
diff --git a/lib/licenses/libthrift-0.7.txt b/lib/licenses/libthrift-0.7.txt
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/lib/licenses/libthrift-0.7.txt
@@ -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.