You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2010/07/14 04:47:04 UTC
svn commit: r963928 [4/4] - in /cassandra/trunk: ./
interface/thrift/gen-java/org/apache/cassandra/thrift/ lib/ lib/licenses/
Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/RowPredicate.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/RowPredicate.java?rev=963928&r1=963927&r2=963928&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/RowPredicate.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/RowPredicate.java Wed Jul 14 02:47:03 2010
@@ -41,10 +41,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.thrift.*;
+import org.apache.thrift.async.*;
import org.apache.thrift.meta_data.*;
+import org.apache.thrift.transport.*;
import org.apache.thrift.protocol.*;
-public class RowPredicate implements TBase<RowPredicate._Fields>, java.io.Serializable, Cloneable, Comparable<RowPredicate> {
+public class RowPredicate implements TBase<RowPredicate, RowPredicate._Fields>, java.io.Serializable, Cloneable {
private static final TStruct STRUCT_DESC = new TStruct("RowPredicate");
private static final TField KEYS_FIELD_DESC = new TField("keys", TType.LIST, (short)1);
@@ -61,12 +63,10 @@ public class RowPredicate implements TBa
KEY_RANGE((short)2, "key_range"),
INDEX_CLAUSE((short)3, "index_clause");
- private static final Map<Integer, _Fields> byId = new HashMap<Integer, _Fields>();
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
static {
for (_Fields field : EnumSet.allOf(_Fields.class)) {
- byId.put((int)field._thriftId, field);
byName.put(field.getFieldName(), field);
}
}
@@ -75,7 +75,16 @@ public class RowPredicate implements TBa
* Find the _Fields constant that matches fieldId, or null if its not found.
*/
public static _Fields findByThriftId(int fieldId) {
- return byId.get(fieldId);
+ switch(fieldId) {
+ case 1: // KEYS
+ return KEYS;
+ case 2: // KEY_RANGE
+ return KEY_RANGE;
+ case 3: // INDEX_CLAUSE
+ return INDEX_CLAUSE;
+ default:
+ return null;
+ }
}
/**
@@ -114,17 +123,17 @@ public class RowPredicate implements TBa
// isset id assignments
- public static final Map<_Fields, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new EnumMap<_Fields, FieldMetaData>(_Fields.class) {{
- put(_Fields.KEYS, new FieldMetaData("keys", TFieldRequirementType.OPTIONAL,
+ public static final Map<_Fields, FieldMetaData> metaDataMap;
+ static {
+ Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.KEYS, new FieldMetaData("keys", TFieldRequirementType.OPTIONAL,
new ListMetaData(TType.LIST,
new FieldValueMetaData(TType.STRING))));
- put(_Fields.KEY_RANGE, new FieldMetaData("key_range", TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.KEY_RANGE, new FieldMetaData("key_range", TFieldRequirementType.OPTIONAL,
new StructMetaData(TType.STRUCT, KeyRange.class)));
- put(_Fields.INDEX_CLAUSE, new FieldMetaData("index_clause", TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.INDEX_CLAUSE, new FieldMetaData("index_clause", TFieldRequirementType.OPTIONAL,
new StructMetaData(TType.STRUCT, IndexClause.class)));
- }});
-
- static {
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
FieldMetaData.addStructMetaDataMap(RowPredicate.class, metaDataMap);
}
@@ -377,7 +386,7 @@ public class RowPredicate implements TBa
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetKeys()) { lastComparison = TBaseHelper.compareTo(keys, typedOther.keys);
+ if (isSetKeys()) { lastComparison = TBaseHelper.compareTo(this.keys, typedOther.keys);
if (lastComparison != 0) {
return lastComparison;
}
@@ -386,7 +395,7 @@ public class RowPredicate implements TBa
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetKey_range()) { lastComparison = TBaseHelper.compareTo(key_range, typedOther.key_range);
+ if (isSetKey_range()) { lastComparison = TBaseHelper.compareTo(this.key_range, typedOther.key_range);
if (lastComparison != 0) {
return lastComparison;
}
@@ -395,7 +404,7 @@ public class RowPredicate implements TBa
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetIndex_clause()) { lastComparison = TBaseHelper.compareTo(index_clause, typedOther.index_clause);
+ if (isSetIndex_clause()) { lastComparison = TBaseHelper.compareTo(this.index_clause, typedOther.index_clause);
if (lastComparison != 0) {
return lastComparison;
}
Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java?rev=963928&r1=963927&r2=963928&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java Wed Jul 14 02:47:03 2010
@@ -41,7 +41,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.thrift.*;
+import org.apache.thrift.async.*;
import org.apache.thrift.meta_data.*;
+import org.apache.thrift.transport.*;
import org.apache.thrift.protocol.*;
/**
@@ -56,7 +58,7 @@ import org.apache.thrift.protocol.*;
* and 'Jim' you can pass those column names as a list to fetch all three at once.
* @param slice_range. A SliceRange describing how to range, order, and/or limit the slice.
*/
-public class SlicePredicate implements TBase<SlicePredicate._Fields>, java.io.Serializable, Cloneable, Comparable<SlicePredicate> {
+public class SlicePredicate implements TBase<SlicePredicate, SlicePredicate._Fields>, java.io.Serializable, Cloneable {
private static final TStruct STRUCT_DESC = new TStruct("SlicePredicate");
private static final TField COLUMN_NAMES_FIELD_DESC = new TField("column_names", TType.LIST, (short)1);
@@ -70,12 +72,10 @@ public class SlicePredicate implements T
COLUMN_NAMES((short)1, "column_names"),
SLICE_RANGE((short)2, "slice_range");
- private static final Map<Integer, _Fields> byId = new HashMap<Integer, _Fields>();
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
static {
for (_Fields field : EnumSet.allOf(_Fields.class)) {
- byId.put((int)field._thriftId, field);
byName.put(field.getFieldName(), field);
}
}
@@ -84,7 +84,14 @@ public class SlicePredicate implements T
* Find the _Fields constant that matches fieldId, or null if its not found.
*/
public static _Fields findByThriftId(int fieldId) {
- return byId.get(fieldId);
+ switch(fieldId) {
+ case 1: // COLUMN_NAMES
+ return COLUMN_NAMES;
+ case 2: // SLICE_RANGE
+ return SLICE_RANGE;
+ default:
+ return null;
+ }
}
/**
@@ -123,15 +130,15 @@ public class SlicePredicate implements T
// isset id assignments
- public static final Map<_Fields, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new EnumMap<_Fields, FieldMetaData>(_Fields.class) {{
- put(_Fields.COLUMN_NAMES, new FieldMetaData("column_names", TFieldRequirementType.OPTIONAL,
+ public static final Map<_Fields, FieldMetaData> metaDataMap;
+ static {
+ Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.COLUMN_NAMES, new FieldMetaData("column_names", TFieldRequirementType.OPTIONAL,
new ListMetaData(TType.LIST,
new FieldValueMetaData(TType.STRING))));
- put(_Fields.SLICE_RANGE, new FieldMetaData("slice_range", TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.SLICE_RANGE, new FieldMetaData("slice_range", TFieldRequirementType.OPTIONAL,
new StructMetaData(TType.STRUCT, SliceRange.class)));
- }});
-
- static {
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
FieldMetaData.addStructMetaDataMap(SlicePredicate.class, metaDataMap);
}
@@ -335,7 +342,7 @@ public class SlicePredicate implements T
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetColumn_names()) { lastComparison = TBaseHelper.compareTo(column_names, typedOther.column_names);
+ if (isSetColumn_names()) { lastComparison = TBaseHelper.compareTo(this.column_names, typedOther.column_names);
if (lastComparison != 0) {
return lastComparison;
}
@@ -344,7 +351,7 @@ public class SlicePredicate implements T
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetSlice_range()) { lastComparison = TBaseHelper.compareTo(slice_range, typedOther.slice_range);
+ if (isSetSlice_range()) { lastComparison = TBaseHelper.compareTo(this.slice_range, typedOther.slice_range);
if (lastComparison != 0) {
return lastComparison;
}
Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java?rev=963928&r1=963927&r2=963928&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java Wed Jul 14 02:47:03 2010
@@ -41,7 +41,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.thrift.*;
+import org.apache.thrift.async.*;
import org.apache.thrift.meta_data.*;
+import org.apache.thrift.transport.*;
import org.apache.thrift.protocol.*;
/**
@@ -61,7 +63,7 @@ import org.apache.thrift.protocol.*;
* of the next instead of increasing 'count' arbitrarily large.
* @param bitmasks. A list of OR-ed binary AND masks applied to the result set.
*/
-public class SliceRange implements TBase<SliceRange._Fields>, java.io.Serializable, Cloneable, Comparable<SliceRange> {
+public class SliceRange implements TBase<SliceRange, SliceRange._Fields>, java.io.Serializable, Cloneable {
private static final TStruct STRUCT_DESC = new TStruct("SliceRange");
private static final TField START_FIELD_DESC = new TField("start", TType.STRING, (short)1);
@@ -84,12 +86,10 @@ public class SliceRange implements TBase
COUNT((short)4, "count"),
BITMASKS((short)5, "bitmasks");
- private static final Map<Integer, _Fields> byId = new HashMap<Integer, _Fields>();
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
static {
for (_Fields field : EnumSet.allOf(_Fields.class)) {
- byId.put((int)field._thriftId, field);
byName.put(field.getFieldName(), field);
}
}
@@ -98,7 +98,20 @@ public class SliceRange implements TBase
* Find the _Fields constant that matches fieldId, or null if its not found.
*/
public static _Fields findByThriftId(int fieldId) {
- return byId.get(fieldId);
+ switch(fieldId) {
+ case 1: // START
+ return START;
+ case 2: // FINISH
+ return FINISH;
+ case 3: // REVERSED
+ return REVERSED;
+ case 4: // COUNT
+ return COUNT;
+ case 5: // BITMASKS
+ return BITMASKS;
+ default:
+ return null;
+ }
}
/**
@@ -140,21 +153,21 @@ public class SliceRange implements TBase
private static final int __COUNT_ISSET_ID = 1;
private BitSet __isset_bit_vector = new BitSet(2);
- public static final Map<_Fields, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new EnumMap<_Fields, FieldMetaData>(_Fields.class) {{
- put(_Fields.START, new FieldMetaData("start", TFieldRequirementType.REQUIRED,
+ public static final Map<_Fields, FieldMetaData> metaDataMap;
+ static {
+ Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.START, new FieldMetaData("start", TFieldRequirementType.REQUIRED,
new FieldValueMetaData(TType.STRING)));
- put(_Fields.FINISH, new FieldMetaData("finish", TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.FINISH, new FieldMetaData("finish", TFieldRequirementType.REQUIRED,
new FieldValueMetaData(TType.STRING)));
- put(_Fields.REVERSED, new FieldMetaData("reversed", TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.REVERSED, new FieldMetaData("reversed", TFieldRequirementType.REQUIRED,
new FieldValueMetaData(TType.BOOL)));
- put(_Fields.COUNT, new FieldMetaData("count", TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.COUNT, new FieldMetaData("count", TFieldRequirementType.REQUIRED,
new FieldValueMetaData(TType.I32)));
- put(_Fields.BITMASKS, new FieldMetaData("bitmasks", TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.BITMASKS, new FieldMetaData("bitmasks", TFieldRequirementType.OPTIONAL,
new ListMetaData(TType.LIST,
new FieldValueMetaData(TType.STRING))));
- }});
-
- static {
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
FieldMetaData.addStructMetaDataMap(SliceRange.class, metaDataMap);
}
@@ -522,7 +535,7 @@ public class SliceRange implements TBase
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetStart()) { lastComparison = TBaseHelper.compareTo(start, typedOther.start);
+ if (isSetStart()) { lastComparison = TBaseHelper.compareTo(this.start, typedOther.start);
if (lastComparison != 0) {
return lastComparison;
}
@@ -531,7 +544,7 @@ public class SliceRange implements TBase
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetFinish()) { lastComparison = TBaseHelper.compareTo(finish, typedOther.finish);
+ if (isSetFinish()) { lastComparison = TBaseHelper.compareTo(this.finish, typedOther.finish);
if (lastComparison != 0) {
return lastComparison;
}
@@ -540,7 +553,7 @@ public class SliceRange implements TBase
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetReversed()) { lastComparison = TBaseHelper.compareTo(reversed, typedOther.reversed);
+ if (isSetReversed()) { lastComparison = TBaseHelper.compareTo(this.reversed, typedOther.reversed);
if (lastComparison != 0) {
return lastComparison;
}
@@ -549,7 +562,7 @@ public class SliceRange implements TBase
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetCount()) { lastComparison = TBaseHelper.compareTo(count, typedOther.count);
+ if (isSetCount()) { lastComparison = TBaseHelper.compareTo(this.count, typedOther.count);
if (lastComparison != 0) {
return lastComparison;
}
@@ -558,7 +571,7 @@ public class SliceRange implements TBase
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetBitmasks()) { lastComparison = TBaseHelper.compareTo(bitmasks, typedOther.bitmasks);
+ if (isSetBitmasks()) { lastComparison = TBaseHelper.compareTo(this.bitmasks, typedOther.bitmasks);
if (lastComparison != 0) {
return lastComparison;
}
Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java?rev=963928&r1=963927&r2=963928&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java Wed Jul 14 02:47:03 2010
@@ -41,7 +41,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.thrift.*;
+import org.apache.thrift.async.*;
import org.apache.thrift.meta_data.*;
+import org.apache.thrift.transport.*;
import org.apache.thrift.protocol.*;
/**
@@ -50,7 +52,7 @@ import org.apache.thrift.protocol.*;
* @param columns. A collection of standard Columns. The columns within a super column are defined in an adhoc manner.
* Columns within a super column do not have to have matching structures (similarly named child columns).
*/
-public class SuperColumn implements TBase<SuperColumn._Fields>, java.io.Serializable, Cloneable, Comparable<SuperColumn> {
+public class SuperColumn implements TBase<SuperColumn, SuperColumn._Fields>, java.io.Serializable, Cloneable {
private static final TStruct STRUCT_DESC = new TStruct("SuperColumn");
private static final TField NAME_FIELD_DESC = new TField("name", TType.STRING, (short)1);
@@ -64,12 +66,10 @@ public class SuperColumn implements TBas
NAME((short)1, "name"),
COLUMNS((short)2, "columns");
- private static final Map<Integer, _Fields> byId = new HashMap<Integer, _Fields>();
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
static {
for (_Fields field : EnumSet.allOf(_Fields.class)) {
- byId.put((int)field._thriftId, field);
byName.put(field.getFieldName(), field);
}
}
@@ -78,7 +78,14 @@ public class SuperColumn implements TBas
* Find the _Fields constant that matches fieldId, or null if its not found.
*/
public static _Fields findByThriftId(int fieldId) {
- return byId.get(fieldId);
+ switch(fieldId) {
+ case 1: // NAME
+ return NAME;
+ case 2: // COLUMNS
+ return COLUMNS;
+ default:
+ return null;
+ }
}
/**
@@ -117,15 +124,15 @@ public class SuperColumn implements TBas
// isset id assignments
- public static final Map<_Fields, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new EnumMap<_Fields, FieldMetaData>(_Fields.class) {{
- put(_Fields.NAME, new FieldMetaData("name", TFieldRequirementType.REQUIRED,
+ public static final Map<_Fields, FieldMetaData> metaDataMap;
+ static {
+ Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.NAME, new FieldMetaData("name", TFieldRequirementType.REQUIRED,
new FieldValueMetaData(TType.STRING)));
- put(_Fields.COLUMNS, new FieldMetaData("columns", TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.COLUMNS, new FieldMetaData("columns", TFieldRequirementType.REQUIRED,
new ListMetaData(TType.LIST,
new StructMetaData(TType.STRUCT, Column.class))));
- }});
-
- static {
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
FieldMetaData.addStructMetaDataMap(SuperColumn.class, metaDataMap);
}
@@ -337,7 +344,7 @@ public class SuperColumn implements TBas
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetName()) { lastComparison = TBaseHelper.compareTo(name, typedOther.name);
+ if (isSetName()) { lastComparison = TBaseHelper.compareTo(this.name, typedOther.name);
if (lastComparison != 0) {
return lastComparison;
}
@@ -346,7 +353,7 @@ public class SuperColumn implements TBas
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetColumns()) { lastComparison = TBaseHelper.compareTo(columns, typedOther.columns);
+ if (isSetColumns()) { lastComparison = TBaseHelper.compareTo(this.columns, typedOther.columns);
if (lastComparison != 0) {
return lastComparison;
}
Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java?rev=963928&r1=963927&r2=963928&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java Wed Jul 14 02:47:03 2010
@@ -41,13 +41,15 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.thrift.*;
+import org.apache.thrift.async.*;
import org.apache.thrift.meta_data.*;
+import org.apache.thrift.transport.*;
import org.apache.thrift.protocol.*;
/**
* RPC timeout was exceeded. either a node failed mid-operation, or load was too high, or the requested op was too large.
*/
-public class TimedOutException extends Exception implements TBase<TimedOutException._Fields>, java.io.Serializable, Cloneable, Comparable<TimedOutException> {
+public class TimedOutException extends Exception implements TBase<TimedOutException, TimedOutException._Fields>, java.io.Serializable, Cloneable {
private static final TStruct STRUCT_DESC = new TStruct("TimedOutException");
@@ -56,12 +58,10 @@ public class TimedOutException extends E
public enum _Fields implements TFieldIdEnum {
;
- private static final Map<Integer, _Fields> byId = new HashMap<Integer, _Fields>();
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
static {
for (_Fields field : EnumSet.allOf(_Fields.class)) {
- byId.put((int)field._thriftId, field);
byName.put(field.getFieldName(), field);
}
}
@@ -70,7 +70,10 @@ public class TimedOutException extends E
* Find the _Fields constant that matches fieldId, or null if its not found.
*/
public static _Fields findByThriftId(int fieldId) {
- return byId.get(fieldId);
+ switch(fieldId) {
+ default:
+ return null;
+ }
}
/**
@@ -106,10 +109,10 @@ public class TimedOutException extends E
return _fieldName;
}
}
- public static final Map<_Fields, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new EnumMap<_Fields, FieldMetaData>(_Fields.class) {{
- }});
-
+ public static final Map<_Fields, FieldMetaData> metaDataMap;
static {
+ Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
FieldMetaData.addStructMetaDataMap(TimedOutException.class, metaDataMap);
}
Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java?rev=963928&r1=963927&r2=963928&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java Wed Jul 14 02:47:03 2010
@@ -41,10 +41,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.thrift.*;
+import org.apache.thrift.async.*;
import org.apache.thrift.meta_data.*;
+import org.apache.thrift.transport.*;
import org.apache.thrift.protocol.*;
-public class TokenRange implements TBase<TokenRange._Fields>, java.io.Serializable, Cloneable, Comparable<TokenRange> {
+public class TokenRange implements TBase<TokenRange, TokenRange._Fields>, java.io.Serializable, Cloneable {
private static final TStruct STRUCT_DESC = new TStruct("TokenRange");
private static final TField START_TOKEN_FIELD_DESC = new TField("start_token", TType.STRING, (short)1);
@@ -61,12 +63,10 @@ public class TokenRange implements TBase
END_TOKEN((short)2, "end_token"),
ENDPOINTS((short)3, "endpoints");
- private static final Map<Integer, _Fields> byId = new HashMap<Integer, _Fields>();
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
static {
for (_Fields field : EnumSet.allOf(_Fields.class)) {
- byId.put((int)field._thriftId, field);
byName.put(field.getFieldName(), field);
}
}
@@ -75,7 +75,16 @@ public class TokenRange implements TBase
* Find the _Fields constant that matches fieldId, or null if its not found.
*/
public static _Fields findByThriftId(int fieldId) {
- return byId.get(fieldId);
+ switch(fieldId) {
+ case 1: // START_TOKEN
+ return START_TOKEN;
+ case 2: // END_TOKEN
+ return END_TOKEN;
+ case 3: // ENDPOINTS
+ return ENDPOINTS;
+ default:
+ return null;
+ }
}
/**
@@ -114,17 +123,17 @@ public class TokenRange implements TBase
// isset id assignments
- public static final Map<_Fields, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new EnumMap<_Fields, FieldMetaData>(_Fields.class) {{
- put(_Fields.START_TOKEN, new FieldMetaData("start_token", TFieldRequirementType.REQUIRED,
+ public static final Map<_Fields, FieldMetaData> metaDataMap;
+ static {
+ Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.START_TOKEN, new FieldMetaData("start_token", TFieldRequirementType.REQUIRED,
new FieldValueMetaData(TType.STRING)));
- put(_Fields.END_TOKEN, new FieldMetaData("end_token", TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.END_TOKEN, new FieldMetaData("end_token", TFieldRequirementType.REQUIRED,
new FieldValueMetaData(TType.STRING)));
- put(_Fields.ENDPOINTS, new FieldMetaData("endpoints", TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.ENDPOINTS, new FieldMetaData("endpoints", TFieldRequirementType.REQUIRED,
new ListMetaData(TType.LIST,
new FieldValueMetaData(TType.STRING))));
- }});
-
- static {
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
FieldMetaData.addStructMetaDataMap(TokenRange.class, metaDataMap);
}
@@ -386,7 +395,7 @@ public class TokenRange implements TBase
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetStart_token()) { lastComparison = TBaseHelper.compareTo(start_token, typedOther.start_token);
+ if (isSetStart_token()) { lastComparison = TBaseHelper.compareTo(this.start_token, typedOther.start_token);
if (lastComparison != 0) {
return lastComparison;
}
@@ -395,7 +404,7 @@ public class TokenRange implements TBase
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetEnd_token()) { lastComparison = TBaseHelper.compareTo(end_token, typedOther.end_token);
+ if (isSetEnd_token()) { lastComparison = TBaseHelper.compareTo(this.end_token, typedOther.end_token);
if (lastComparison != 0) {
return lastComparison;
}
@@ -404,7 +413,7 @@ public class TokenRange implements TBase
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetEndpoints()) { lastComparison = TBaseHelper.compareTo(endpoints, typedOther.endpoints);
+ if (isSetEndpoints()) { lastComparison = TBaseHelper.compareTo(this.endpoints, typedOther.endpoints);
if (lastComparison != 0) {
return lastComparison;
}
Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java?rev=963928&r1=963927&r2=963928&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java Wed Jul 14 02:47:03 2010
@@ -41,13 +41,15 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.thrift.*;
+import org.apache.thrift.async.*;
import org.apache.thrift.meta_data.*;
+import org.apache.thrift.transport.*;
import org.apache.thrift.protocol.*;
/**
* Not all the replicas required could be created and/or read.
*/
-public class UnavailableException extends Exception implements TBase<UnavailableException._Fields>, java.io.Serializable, Cloneable, Comparable<UnavailableException> {
+public class UnavailableException extends Exception implements TBase<UnavailableException, UnavailableException._Fields>, java.io.Serializable, Cloneable {
private static final TStruct STRUCT_DESC = new TStruct("UnavailableException");
@@ -56,12 +58,10 @@ public class UnavailableException extend
public enum _Fields implements TFieldIdEnum {
;
- private static final Map<Integer, _Fields> byId = new HashMap<Integer, _Fields>();
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
static {
for (_Fields field : EnumSet.allOf(_Fields.class)) {
- byId.put((int)field._thriftId, field);
byName.put(field.getFieldName(), field);
}
}
@@ -70,7 +70,10 @@ public class UnavailableException extend
* Find the _Fields constant that matches fieldId, or null if its not found.
*/
public static _Fields findByThriftId(int fieldId) {
- return byId.get(fieldId);
+ switch(fieldId) {
+ default:
+ return null;
+ }
}
/**
@@ -106,10 +109,10 @@ public class UnavailableException extend
return _fieldName;
}
}
- public static final Map<_Fields, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new EnumMap<_Fields, FieldMetaData>(_Fields.class) {{
- }});
-
+ public static final Map<_Fields, FieldMetaData> metaDataMap;
static {
+ Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
FieldMetaData.addStructMetaDataMap(UnavailableException.class, metaDataMap);
}
Added: cassandra/trunk/lib/libthrift-r959516.jar
URL: http://svn.apache.org/viewvc/cassandra/trunk/lib/libthrift-r959516.jar?rev=963928&view=auto
==============================================================================
Files cassandra/trunk/lib/libthrift-r959516.jar (added) and cassandra/trunk/lib/libthrift-r959516.jar Wed Jul 14 02:47:03 2010 differ
Copied: cassandra/trunk/libthrift-r959516.txt (from r963842, cassandra/trunk/lib/licenses/libthrift-r917130.txt)
URL: http://svn.apache.org/viewvc/cassandra/trunk/libthrift-r959516.txt?p2=cassandra/trunk/libthrift-r959516.txt&p1=cassandra/trunk/lib/licenses/libthrift-r917130.txt&r1=963842&r2=963928&rev=963928&view=diff
==============================================================================
(empty)