You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by gd...@apache.org on 2011/04/08 02:47:46 UTC
svn commit: r1090076 [6/7] -
/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/
Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java?rev=1090076&r1=1090075&r2=1090076&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java Fri Apr 8 00:47:44 2011
@@ -42,20 +42,14 @@ import java.util.Arrays;
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 KsDef implements TBase<KsDef, KsDef._Fields>, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("KsDef");
-
- private static final TField NAME_FIELD_DESC = new TField("name", TType.STRING, (short)1);
- private static final TField STRATEGY_CLASS_FIELD_DESC = new TField("strategy_class", TType.STRING, (short)2);
- private static final TField STRATEGY_OPTIONS_FIELD_DESC = new TField("strategy_options", TType.MAP, (short)3);
- private static final TField REPLICATION_FACTOR_FIELD_DESC = new TField("replication_factor", TType.I32, (short)4);
- private static final TField CF_DEFS_FIELD_DESC = new TField("cf_defs", TType.LIST, (short)5);
+public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KsDef");
+
+ private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField STRATEGY_CLASS_FIELD_DESC = new org.apache.thrift.protocol.TField("strategy_class", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField STRATEGY_OPTIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("strategy_options", org.apache.thrift.protocol.TType.MAP, (short)3);
+ private static final org.apache.thrift.protocol.TField REPLICATION_FACTOR_FIELD_DESC = new org.apache.thrift.protocol.TField("replication_factor", org.apache.thrift.protocol.TType.I32, (short)4);
+ 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);
public String name;
public String strategy_class;
@@ -64,7 +58,7 @@ public class KsDef implements TBase<KsDe
public List<CfDef> cf_defs;
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements TFieldIdEnum {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
NAME((short)1, "name"),
STRATEGY_CLASS((short)2, "strategy_class"),
STRATEGY_OPTIONS((short)3, "strategy_options"),
@@ -137,24 +131,24 @@ public class KsDef implements TBase<KsDe
private static final int __REPLICATION_FACTOR_ISSET_ID = 0;
private BitSet __isset_bit_vector = new BitSet(1);
- public static final Map<_Fields, FieldMetaData> metaDataMap;
+ public static final Map<_Fields, org.apache.thrift.meta_data.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)));
- tmpMap.put(_Fields.STRATEGY_CLASS, new FieldMetaData("strategy_class", TFieldRequirementType.REQUIRED,
- new FieldValueMetaData(TType.STRING)));
- tmpMap.put(_Fields.STRATEGY_OPTIONS, new FieldMetaData("strategy_options", TFieldRequirementType.OPTIONAL,
- new MapMetaData(TType.MAP,
- new FieldValueMetaData(TType.STRING),
- new FieldValueMetaData(TType.STRING))));
- tmpMap.put(_Fields.REPLICATION_FACTOR, new FieldMetaData("replication_factor", TFieldRequirementType.REQUIRED,
- new FieldValueMetaData(TType.I32)));
- tmpMap.put(_Fields.CF_DEFS, new FieldMetaData("cf_defs", TFieldRequirementType.REQUIRED,
- new ListMetaData(TType.LIST,
- new StructMetaData(TType.STRUCT, CfDef.class))));
+ Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.STRATEGY_CLASS, new org.apache.thrift.meta_data.FieldMetaData("strategy_class", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.STRATEGY_OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("strategy_options", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+ tmpMap.put(_Fields.REPLICATION_FACTOR, new org.apache.thrift.meta_data.FieldMetaData("replication_factor", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+ tmpMap.put(_Fields.CF_DEFS, new org.apache.thrift.meta_data.FieldMetaData("cf_defs", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, CfDef.class))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- FieldMetaData.addStructMetaDataMap(KsDef.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(KsDef.class, metaDataMap);
}
public KsDef() {
@@ -238,7 +232,7 @@ public class KsDef implements TBase<KsDe
this.name = null;
}
- /** Returns true if field name is set (has been asigned a value) and false otherwise */
+ /** Returns true if field name is set (has been assigned a value) and false otherwise */
public boolean isSetName() {
return this.name != null;
}
@@ -262,7 +256,7 @@ public class KsDef implements TBase<KsDe
this.strategy_class = null;
}
- /** Returns true if field strategy_class is set (has been asigned a value) and false otherwise */
+ /** Returns true if field strategy_class is set (has been assigned a value) and false otherwise */
public boolean isSetStrategy_class() {
return this.strategy_class != null;
}
@@ -297,7 +291,7 @@ public class KsDef implements TBase<KsDe
this.strategy_options = null;
}
- /** Returns true if field strategy_options is set (has been asigned a value) and false otherwise */
+ /** Returns true if field strategy_options is set (has been assigned a value) and false otherwise */
public boolean isSetStrategy_options() {
return this.strategy_options != null;
}
@@ -322,7 +316,7 @@ public class KsDef implements TBase<KsDe
__isset_bit_vector.clear(__REPLICATION_FACTOR_ISSET_ID);
}
- /** Returns true if field replication_factor is set (has been asigned a value) and false otherwise */
+ /** Returns true if field replication_factor is set (has been assigned a value) and false otherwise */
public boolean isSetReplication_factor() {
return __isset_bit_vector.get(__REPLICATION_FACTOR_ISSET_ID);
}
@@ -359,7 +353,7 @@ public class KsDef implements TBase<KsDe
this.cf_defs = null;
}
- /** Returns true if field cf_defs is set (has been asigned a value) and false otherwise */
+ /** Returns true if field cf_defs is set (has been assigned a value) and false otherwise */
public boolean isSetCf_defs() {
return this.cf_defs != null;
}
@@ -436,7 +430,7 @@ public class KsDef implements TBase<KsDe
throw new IllegalStateException();
}
- /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
public boolean isSet(_Fields field) {
if (field == null) {
throw new IllegalArgumentException();
@@ -563,7 +557,7 @@ public class KsDef implements TBase<KsDe
return lastComparison;
}
if (isSetName()) {
- lastComparison = TBaseHelper.compareTo(this.name, typedOther.name);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name);
if (lastComparison != 0) {
return lastComparison;
}
@@ -573,7 +567,7 @@ public class KsDef implements TBase<KsDe
return lastComparison;
}
if (isSetStrategy_class()) {
- lastComparison = TBaseHelper.compareTo(this.strategy_class, typedOther.strategy_class);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.strategy_class, typedOther.strategy_class);
if (lastComparison != 0) {
return lastComparison;
}
@@ -583,7 +577,7 @@ public class KsDef implements TBase<KsDe
return lastComparison;
}
if (isSetStrategy_options()) {
- lastComparison = TBaseHelper.compareTo(this.strategy_options, typedOther.strategy_options);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.strategy_options, typedOther.strategy_options);
if (lastComparison != 0) {
return lastComparison;
}
@@ -593,7 +587,7 @@ public class KsDef implements TBase<KsDe
return lastComparison;
}
if (isSetReplication_factor()) {
- lastComparison = TBaseHelper.compareTo(this.replication_factor, typedOther.replication_factor);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.replication_factor, typedOther.replication_factor);
if (lastComparison != 0) {
return lastComparison;
}
@@ -603,7 +597,7 @@ public class KsDef implements TBase<KsDe
return lastComparison;
}
if (isSetCf_defs()) {
- lastComparison = TBaseHelper.compareTo(this.cf_defs, typedOther.cf_defs);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cf_defs, typedOther.cf_defs);
if (lastComparison != 0) {
return lastComparison;
}
@@ -615,34 +609,34 @@ public class KsDef implements TBase<KsDe
return _Fields.findByThriftId(fieldId);
}
- public void read(TProtocol iprot) throws TException {
- TField field;
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField field;
iprot.readStructBegin();
while (true)
{
field = iprot.readFieldBegin();
- if (field.type == TType.STOP) {
+ if (field.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (field.id) {
case 1: // NAME
- if (field.type == TType.STRING) {
+ if (field.type == org.apache.thrift.protocol.TType.STRING) {
this.name = iprot.readString();
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 2: // STRATEGY_CLASS
- if (field.type == TType.STRING) {
+ if (field.type == org.apache.thrift.protocol.TType.STRING) {
this.strategy_class = iprot.readString();
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 3: // STRATEGY_OPTIONS
- if (field.type == TType.MAP) {
+ if (field.type == org.apache.thrift.protocol.TType.MAP) {
{
- TMap _map33 = iprot.readMapBegin();
+ org.apache.thrift.protocol.TMap _map33 = iprot.readMapBegin();
this.strategy_options = new HashMap<String,String>(2*_map33.size);
for (int _i34 = 0; _i34 < _map33.size; ++_i34)
{
@@ -655,21 +649,21 @@ public class KsDef implements TBase<KsDe
iprot.readMapEnd();
}
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 4: // REPLICATION_FACTOR
- if (field.type == TType.I32) {
+ if (field.type == org.apache.thrift.protocol.TType.I32) {
this.replication_factor = iprot.readI32();
setReplication_factorIsSet(true);
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 5: // CF_DEFS
- if (field.type == TType.LIST) {
+ if (field.type == org.apache.thrift.protocol.TType.LIST) {
{
- TList _list37 = iprot.readListBegin();
+ org.apache.thrift.protocol.TList _list37 = iprot.readListBegin();
this.cf_defs = new ArrayList<CfDef>(_list37.size);
for (int _i38 = 0; _i38 < _list37.size; ++_i38)
{
@@ -681,11 +675,11 @@ public class KsDef implements TBase<KsDe
iprot.readListEnd();
}
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
default:
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
iprot.readFieldEnd();
}
@@ -693,12 +687,12 @@ public class KsDef implements TBase<KsDe
// check for required fields of primitive type, which can't be checked in the validate method
if (!isSetReplication_factor()) {
- throw new TProtocolException("Required field 'replication_factor' was not found in serialized data! Struct: " + toString());
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'replication_factor' was not found in serialized data! Struct: " + toString());
}
validate();
}
- public void write(TProtocol oprot) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -716,7 +710,7 @@ public class KsDef implements TBase<KsDe
if (isSetStrategy_options()) {
oprot.writeFieldBegin(STRATEGY_OPTIONS_FIELD_DESC);
{
- oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, this.strategy_options.size()));
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.strategy_options.size()));
for (Map.Entry<String, String> _iter40 : this.strategy_options.entrySet())
{
oprot.writeString(_iter40.getKey());
@@ -733,7 +727,7 @@ public class KsDef implements TBase<KsDe
if (this.cf_defs != null) {
oprot.writeFieldBegin(CF_DEFS_FIELD_DESC);
{
- oprot.writeListBegin(new TList(TType.STRUCT, this.cf_defs.size()));
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.cf_defs.size()));
for (CfDef _iter41 : this.cf_defs)
{
_iter41.write(oprot);
@@ -792,17 +786,35 @@ public class KsDef implements TBase<KsDe
return sb.toString();
}
- public void validate() throws TException {
+ public void validate() throws org.apache.thrift.TException {
// check for required fields
if (name == null) {
- throw new TProtocolException("Required field 'name' was not present! Struct: " + toString());
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'name' was not present! Struct: " + toString());
}
if (strategy_class == null) {
- throw new TProtocolException("Required field 'strategy_class' was not present! Struct: " + toString());
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'strategy_class' was not present! Struct: " + toString());
}
// alas, we cannot check 'replication_factor' because it's a primitive and you chose the non-beans generator.
if (cf_defs == null) {
- throw new TProtocolException("Required field 'cf_defs' was not present! Struct: " + toString());
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'cf_defs' was not present! Struct: " + toString());
+ }
+ }
+
+ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+ try {
+ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ try {
+ // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+ __isset_bit_vector = new BitSet(1);
+ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
}
}
Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java?rev=1090076&r1=1090075&r2=1090076&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java Fri Apr 8 00:47:44 2011
@@ -42,31 +42,25 @@ import java.util.Arrays;
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.*;
-
/**
* A Mutation is either an insert (represented by filling column_or_supercolumn), a deletion (represented by filling the deletion attribute),
* a counter addition (represented by filling counter), or a counter deletion (represented by filling counter_deletion).
* @param column_or_supercolumn. An insert to a column or supercolumn
* @param deletion. A deletion of a column or supercolumn
*/
-public class Mutation implements TBase<Mutation, Mutation._Fields>, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("Mutation");
+public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fields>, java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Mutation");
- private static final TField COLUMN_OR_SUPERCOLUMN_FIELD_DESC = new TField("column_or_supercolumn", TType.STRUCT, (short)1);
- private static final TField DELETION_FIELD_DESC = new TField("deletion", TType.STRUCT, (short)2);
- private static final TField COUNTER_FIELD_DESC = new TField("counter", TType.STRUCT, (short)3);
+ 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);
+ private static final org.apache.thrift.protocol.TField COUNTER_FIELD_DESC = new org.apache.thrift.protocol.TField("counter", org.apache.thrift.protocol.TType.STRUCT, (short)3);
public ColumnOrSuperColumn column_or_supercolumn;
public Deletion deletion;
public Counter counter;
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements TFieldIdEnum {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
COLUMN_OR_SUPERCOLUMN((short)1, "column_or_supercolumn"),
DELETION((short)2, "deletion"),
COUNTER((short)3, "counter");
@@ -131,17 +125,17 @@ public class Mutation implements TBase<M
// isset id assignments
- public static final Map<_Fields, FieldMetaData> metaDataMap;
+ public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
- Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.COLUMN_OR_SUPERCOLUMN, new FieldMetaData("column_or_supercolumn", TFieldRequirementType.OPTIONAL,
- new StructMetaData(TType.STRUCT, ColumnOrSuperColumn.class)));
- tmpMap.put(_Fields.DELETION, new FieldMetaData("deletion", TFieldRequirementType.OPTIONAL,
- new StructMetaData(TType.STRUCT, Deletion.class)));
- tmpMap.put(_Fields.COUNTER, new FieldMetaData("counter", TFieldRequirementType.OPTIONAL,
- new StructMetaData(TType.STRUCT, Counter.class)));
+ Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.COLUMN_OR_SUPERCOLUMN, new org.apache.thrift.meta_data.FieldMetaData("column_or_supercolumn", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ColumnOrSuperColumn.class)));
+ tmpMap.put(_Fields.DELETION, new org.apache.thrift.meta_data.FieldMetaData("deletion", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Deletion.class)));
+ tmpMap.put(_Fields.COUNTER, new org.apache.thrift.meta_data.FieldMetaData("counter", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Counter.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- FieldMetaData.addStructMetaDataMap(Mutation.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Mutation.class, metaDataMap);
}
public Mutation() {
@@ -186,7 +180,7 @@ public class Mutation implements TBase<M
this.column_or_supercolumn = null;
}
- /** Returns true if field column_or_supercolumn is set (has been asigned a value) and false otherwise */
+ /** Returns true if field column_or_supercolumn is set (has been assigned a value) and false otherwise */
public boolean isSetColumn_or_supercolumn() {
return this.column_or_supercolumn != null;
}
@@ -210,7 +204,7 @@ public class Mutation implements TBase<M
this.deletion = null;
}
- /** Returns true if field deletion is set (has been asigned a value) and false otherwise */
+ /** Returns true if field deletion is set (has been assigned a value) and false otherwise */
public boolean isSetDeletion() {
return this.deletion != null;
}
@@ -234,7 +228,7 @@ public class Mutation implements TBase<M
this.counter = null;
}
- /** Returns true if field counter is set (has been asigned a value) and false otherwise */
+ /** Returns true if field counter is set (has been assigned a value) and false otherwise */
public boolean isSetCounter() {
return this.counter != null;
}
@@ -289,7 +283,7 @@ public class Mutation implements TBase<M
throw new IllegalStateException();
}
- /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
public boolean isSet(_Fields field) {
if (field == null) {
throw new IllegalArgumentException();
@@ -384,7 +378,7 @@ public class Mutation implements TBase<M
return lastComparison;
}
if (isSetColumn_or_supercolumn()) {
- lastComparison = TBaseHelper.compareTo(this.column_or_supercolumn, typedOther.column_or_supercolumn);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_or_supercolumn, typedOther.column_or_supercolumn);
if (lastComparison != 0) {
return lastComparison;
}
@@ -394,7 +388,7 @@ public class Mutation implements TBase<M
return lastComparison;
}
if (isSetDeletion()) {
- lastComparison = TBaseHelper.compareTo(this.deletion, typedOther.deletion);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.deletion, typedOther.deletion);
if (lastComparison != 0) {
return lastComparison;
}
@@ -404,7 +398,7 @@ public class Mutation implements TBase<M
return lastComparison;
}
if (isSetCounter()) {
- lastComparison = TBaseHelper.compareTo(this.counter, typedOther.counter);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.counter, typedOther.counter);
if (lastComparison != 0) {
return lastComparison;
}
@@ -416,42 +410,42 @@ public class Mutation implements TBase<M
return _Fields.findByThriftId(fieldId);
}
- public void read(TProtocol iprot) throws TException {
- TField field;
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField field;
iprot.readStructBegin();
while (true)
{
field = iprot.readFieldBegin();
- if (field.type == TType.STOP) {
+ if (field.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (field.id) {
case 1: // COLUMN_OR_SUPERCOLUMN
- if (field.type == TType.STRUCT) {
+ if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
this.column_or_supercolumn = new ColumnOrSuperColumn();
this.column_or_supercolumn.read(iprot);
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 2: // DELETION
- if (field.type == TType.STRUCT) {
+ if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
this.deletion = new Deletion();
this.deletion.read(iprot);
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 3: // COUNTER
- if (field.type == TType.STRUCT) {
+ if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
this.counter = new Counter();
this.counter.read(iprot);
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
default:
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
iprot.readFieldEnd();
}
@@ -461,7 +455,7 @@ public class Mutation implements TBase<M
validate();
}
- public void write(TProtocol oprot) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -528,9 +522,25 @@ public class Mutation implements TBase<M
return sb.toString();
}
- public void validate() throws TException {
+ public void validate() throws org.apache.thrift.TException {
// check for required fields
}
+ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+ try {
+ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ try {
+ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
}
Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java?rev=1090076&r1=1090075&r2=1090076&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java Fri Apr 8 00:47:44 2011
@@ -42,22 +42,16 @@ import java.util.Arrays;
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.*;
-
/**
* A specific column was requested that does not exist.
*/
-public class NotFoundException extends Exception implements TBase<NotFoundException, NotFoundException._Fields>, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("NotFoundException");
+public class NotFoundException extends Exception implements org.apache.thrift.TBase<NotFoundException, NotFoundException._Fields>, java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotFoundException");
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements TFieldIdEnum {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
;
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -111,11 +105,11 @@ public class NotFoundException extends E
return _fieldName;
}
}
- public static final Map<_Fields, FieldMetaData> metaDataMap;
+ public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
- Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
+ Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
metaDataMap = Collections.unmodifiableMap(tmpMap);
- FieldMetaData.addStructMetaDataMap(NotFoundException.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NotFoundException.class, metaDataMap);
}
public NotFoundException() {
@@ -146,7 +140,7 @@ public class NotFoundException extends E
throw new IllegalStateException();
}
- /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
public boolean isSet(_Fields field) {
if (field == null) {
throw new IllegalArgumentException();
@@ -195,18 +189,18 @@ public class NotFoundException extends E
return _Fields.findByThriftId(fieldId);
}
- public void read(TProtocol iprot) throws TException {
- TField field;
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField field;
iprot.readStructBegin();
while (true)
{
field = iprot.readFieldBegin();
- if (field.type == TType.STOP) {
+ if (field.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (field.id) {
default:
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
iprot.readFieldEnd();
}
@@ -216,7 +210,7 @@ public class NotFoundException extends E
validate();
}
- public void write(TProtocol oprot) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -233,9 +227,25 @@ public class NotFoundException extends E
return sb.toString();
}
- public void validate() throws TException {
+ public void validate() throws org.apache.thrift.TException {
// check for required fields
}
+ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+ try {
+ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ try {
+ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
}
Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java?rev=1090076&r1=1090075&r2=1090076&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java Fri Apr 8 00:47:44 2011
@@ -42,22 +42,16 @@ import java.util.Arrays;
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.*;
-
/**
* schemas are not in agreement across all nodes
*/
-public class SchemaDisagreementException extends Exception implements TBase<SchemaDisagreementException, SchemaDisagreementException._Fields>, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("SchemaDisagreementException");
+public class SchemaDisagreementException extends Exception implements org.apache.thrift.TBase<SchemaDisagreementException, SchemaDisagreementException._Fields>, java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SchemaDisagreementException");
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements TFieldIdEnum {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
;
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -111,11 +105,11 @@ public class SchemaDisagreementException
return _fieldName;
}
}
- public static final Map<_Fields, FieldMetaData> metaDataMap;
+ public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
- Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
+ Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
metaDataMap = Collections.unmodifiableMap(tmpMap);
- FieldMetaData.addStructMetaDataMap(SchemaDisagreementException.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SchemaDisagreementException.class, metaDataMap);
}
public SchemaDisagreementException() {
@@ -146,7 +140,7 @@ public class SchemaDisagreementException
throw new IllegalStateException();
}
- /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
public boolean isSet(_Fields field) {
if (field == null) {
throw new IllegalArgumentException();
@@ -195,18 +189,18 @@ public class SchemaDisagreementException
return _Fields.findByThriftId(fieldId);
}
- public void read(TProtocol iprot) throws TException {
- TField field;
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField field;
iprot.readStructBegin();
while (true)
{
field = iprot.readFieldBegin();
- if (field.type == TType.STOP) {
+ if (field.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (field.id) {
default:
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
iprot.readFieldEnd();
}
@@ -216,7 +210,7 @@ public class SchemaDisagreementException
validate();
}
- public void write(TProtocol oprot) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -233,9 +227,25 @@ public class SchemaDisagreementException
return sb.toString();
}
- public void validate() throws TException {
+ public void validate() throws org.apache.thrift.TException {
// check for required fields
}
+ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+ try {
+ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ try {
+ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
}
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=1090076&r1=1090075&r2=1090076&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 Fri Apr 8 00:47:44 2011
@@ -42,12 +42,6 @@ import java.util.Arrays;
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.*;
-
/**
* A SlicePredicate is similar to a mathematic predicate (see http://en.wikipedia.org/wiki/Predicate_(mathematical_logic)),
* which is described as "a property that the elements of a set have in common."
@@ -60,17 +54,17 @@ 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, SlicePredicate._Fields>, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("SlicePredicate");
+public class SlicePredicate implements org.apache.thrift.TBase<SlicePredicate, SlicePredicate._Fields>, java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SlicePredicate");
- private static final TField COLUMN_NAMES_FIELD_DESC = new TField("column_names", TType.LIST, (short)1);
- private static final TField SLICE_RANGE_FIELD_DESC = new TField("slice_range", TType.STRUCT, (short)2);
+ 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;
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements TFieldIdEnum {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
COLUMN_NAMES((short)1, "column_names"),
SLICE_RANGE((short)2, "slice_range");
@@ -132,16 +126,16 @@ public class SlicePredicate implements T
// isset id assignments
- public static final Map<_Fields, FieldMetaData> metaDataMap;
+ public static final Map<_Fields, org.apache.thrift.meta_data.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))));
- tmpMap.put(_Fields.SLICE_RANGE, new FieldMetaData("slice_range", TFieldRequirementType.OPTIONAL,
- new StructMetaData(TType.STRUCT, SliceRange.class)));
+ Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.COLUMN_NAMES, new org.apache.thrift.meta_data.FieldMetaData("column_names", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))));
+ tmpMap.put(_Fields.SLICE_RANGE, new org.apache.thrift.meta_data.FieldMetaData("slice_range", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SliceRange.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- FieldMetaData.addStructMetaDataMap(SlicePredicate.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SlicePredicate.class, metaDataMap);
}
public SlicePredicate() {
@@ -154,7 +148,7 @@ public class SlicePredicate implements T
if (other.isSetColumn_names()) {
List<ByteBuffer> __this__column_names = new ArrayList<ByteBuffer>();
for (ByteBuffer other_element : other.column_names) {
- ByteBuffer temp_binary_element = TBaseHelper.copyBinary(other_element);
+ ByteBuffer temp_binary_element = org.apache.thrift.TBaseHelper.copyBinary(other_element);
;
__this__column_names.add(temp_binary_element);
}
@@ -203,7 +197,7 @@ public class SlicePredicate implements T
this.column_names = null;
}
- /** Returns true if field column_names is set (has been asigned a value) and false otherwise */
+ /** Returns true if field column_names is set (has been assigned a value) and false otherwise */
public boolean isSetColumn_names() {
return this.column_names != null;
}
@@ -227,7 +221,7 @@ public class SlicePredicate implements T
this.slice_range = null;
}
- /** Returns true if field slice_range is set (has been asigned a value) and false otherwise */
+ /** Returns true if field slice_range is set (has been assigned a value) and false otherwise */
public boolean isSetSlice_range() {
return this.slice_range != null;
}
@@ -271,7 +265,7 @@ public class SlicePredicate implements T
throw new IllegalStateException();
}
- /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
public boolean isSet(_Fields field) {
if (field == null) {
throw new IllegalArgumentException();
@@ -350,7 +344,7 @@ public class SlicePredicate implements T
return lastComparison;
}
if (isSetColumn_names()) {
- lastComparison = TBaseHelper.compareTo(this.column_names, typedOther.column_names);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_names, typedOther.column_names);
if (lastComparison != 0) {
return lastComparison;
}
@@ -360,7 +354,7 @@ public class SlicePredicate implements T
return lastComparison;
}
if (isSetSlice_range()) {
- lastComparison = TBaseHelper.compareTo(this.slice_range, typedOther.slice_range);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.slice_range, typedOther.slice_range);
if (lastComparison != 0) {
return lastComparison;
}
@@ -372,20 +366,20 @@ public class SlicePredicate implements T
return _Fields.findByThriftId(fieldId);
}
- public void read(TProtocol iprot) throws TException {
- TField field;
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField field;
iprot.readStructBegin();
while (true)
{
field = iprot.readFieldBegin();
- if (field.type == TType.STOP) {
+ if (field.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (field.id) {
case 1: // COLUMN_NAMES
- if (field.type == TType.LIST) {
+ if (field.type == org.apache.thrift.protocol.TType.LIST) {
{
- TList _list8 = iprot.readListBegin();
+ org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
this.column_names = new ArrayList<ByteBuffer>(_list8.size);
for (int _i9 = 0; _i9 < _list8.size; ++_i9)
{
@@ -396,19 +390,19 @@ public class SlicePredicate implements T
iprot.readListEnd();
}
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 2: // SLICE_RANGE
- if (field.type == TType.STRUCT) {
+ if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
this.slice_range = new SliceRange();
this.slice_range.read(iprot);
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
default:
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
iprot.readFieldEnd();
}
@@ -418,7 +412,7 @@ public class SlicePredicate implements T
validate();
}
- public void write(TProtocol oprot) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -426,7 +420,7 @@ public class SlicePredicate implements T
if (isSetColumn_names()) {
oprot.writeFieldBegin(COLUMN_NAMES_FIELD_DESC);
{
- oprot.writeListBegin(new TList(TType.STRING, this.column_names.size()));
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.column_names.size()));
for (ByteBuffer _iter11 : this.column_names)
{
oprot.writeBinary(_iter11);
@@ -475,9 +469,25 @@ public class SlicePredicate implements T
return sb.toString();
}
- public void validate() throws TException {
+ public void validate() throws org.apache.thrift.TException {
// check for required fields
}
+ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+ try {
+ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ try {
+ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
}
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=1090076&r1=1090075&r2=1090076&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 Fri Apr 8 00:47:44 2011
@@ -42,12 +42,6 @@ import java.util.Arrays;
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.*;
-
/**
* A slice range is a structure that stores basic range, ordering and limit information for a query that will return
* multiple columns. It could be thought of as Cassandra's version of LIMIT and ORDER BY
@@ -64,13 +58,13 @@ import org.apache.thrift.protocol.*;
* be better served by iterating through slices by passing the last value of one call in as the 'start'
* of the next instead of increasing 'count' arbitrarily large.
*/
-public class SliceRange implements TBase<SliceRange, SliceRange._Fields>, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("SliceRange");
+public class SliceRange implements org.apache.thrift.TBase<SliceRange, SliceRange._Fields>, java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SliceRange");
- private static final TField START_FIELD_DESC = new TField("start", TType.STRING, (short)1);
- private static final TField FINISH_FIELD_DESC = new TField("finish", TType.STRING, (short)2);
- private static final TField REVERSED_FIELD_DESC = new TField("reversed", TType.BOOL, (short)3);
- private static final TField COUNT_FIELD_DESC = new TField("count", TType.I32, (short)4);
+ private static final org.apache.thrift.protocol.TField START_FIELD_DESC = new org.apache.thrift.protocol.TField("start", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField FINISH_FIELD_DESC = new org.apache.thrift.protocol.TField("finish", org.apache.thrift.protocol.TType.STRING, (short)2);
+ 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;
@@ -78,7 +72,7 @@ public class SliceRange implements TBase
public int count;
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements TFieldIdEnum {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
START((short)1, "start"),
FINISH((short)2, "finish"),
REVERSED((short)3, "reversed"),
@@ -149,19 +143,19 @@ 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;
+ public static final Map<_Fields, org.apache.thrift.meta_data.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)));
- tmpMap.put(_Fields.FINISH, new FieldMetaData("finish", TFieldRequirementType.REQUIRED,
- new FieldValueMetaData(TType.STRING)));
- tmpMap.put(_Fields.REVERSED, new FieldMetaData("reversed", TFieldRequirementType.REQUIRED,
- new FieldValueMetaData(TType.BOOL)));
- tmpMap.put(_Fields.COUNT, new FieldMetaData("count", TFieldRequirementType.REQUIRED,
- new FieldValueMetaData(TType.I32)));
+ Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.START, new org.apache.thrift.meta_data.FieldMetaData("start", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
+ tmpMap.put(_Fields.FINISH, new org.apache.thrift.meta_data.FieldMetaData("finish", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
+ tmpMap.put(_Fields.REVERSED, new org.apache.thrift.meta_data.FieldMetaData("reversed", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+ tmpMap.put(_Fields.COUNT, new org.apache.thrift.meta_data.FieldMetaData("count", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- FieldMetaData.addStructMetaDataMap(SliceRange.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SliceRange.class, metaDataMap);
}
public SliceRange() {
@@ -193,11 +187,11 @@ public class SliceRange implements TBase
__isset_bit_vector.clear();
__isset_bit_vector.or(other.__isset_bit_vector);
if (other.isSetStart()) {
- this.start = TBaseHelper.copyBinary(other.start);
+ this.start = org.apache.thrift.TBaseHelper.copyBinary(other.start);
;
}
if (other.isSetFinish()) {
- this.finish = TBaseHelper.copyBinary(other.finish);
+ this.finish = org.apache.thrift.TBaseHelper.copyBinary(other.finish);
;
}
this.reversed = other.reversed;
@@ -219,16 +213,16 @@ public class SliceRange implements TBase
}
public byte[] getStart() {
- setStart(TBaseHelper.rightSize(start));
- return start.array();
+ setStart(org.apache.thrift.TBaseHelper.rightSize(start));
+ return start == null ? null : start.array();
}
- public ByteBuffer BufferForStart() {
+ public ByteBuffer bufferForStart() {
return start;
}
public SliceRange setStart(byte[] start) {
- setStart(ByteBuffer.wrap(start));
+ setStart(start == null ? (ByteBuffer)null : ByteBuffer.wrap(start));
return this;
}
@@ -241,7 +235,7 @@ public class SliceRange implements TBase
this.start = null;
}
- /** Returns true if field start is set (has been asigned a value) and false otherwise */
+ /** Returns true if field start is set (has been assigned a value) and false otherwise */
public boolean isSetStart() {
return this.start != null;
}
@@ -253,16 +247,16 @@ public class SliceRange implements TBase
}
public byte[] getFinish() {
- setFinish(TBaseHelper.rightSize(finish));
- return finish.array();
+ setFinish(org.apache.thrift.TBaseHelper.rightSize(finish));
+ return finish == null ? null : finish.array();
}
- public ByteBuffer BufferForFinish() {
+ public ByteBuffer bufferForFinish() {
return finish;
}
public SliceRange setFinish(byte[] finish) {
- setFinish(ByteBuffer.wrap(finish));
+ setFinish(finish == null ? (ByteBuffer)null : ByteBuffer.wrap(finish));
return this;
}
@@ -275,7 +269,7 @@ public class SliceRange implements TBase
this.finish = null;
}
- /** Returns true if field finish is set (has been asigned a value) and false otherwise */
+ /** Returns true if field finish is set (has been assigned a value) and false otherwise */
public boolean isSetFinish() {
return this.finish != null;
}
@@ -300,7 +294,7 @@ public class SliceRange implements TBase
__isset_bit_vector.clear(__REVERSED_ISSET_ID);
}
- /** Returns true if field reversed is set (has been asigned a value) and false otherwise */
+ /** Returns true if field reversed is set (has been assigned a value) and false otherwise */
public boolean isSetReversed() {
return __isset_bit_vector.get(__REVERSED_ISSET_ID);
}
@@ -323,7 +317,7 @@ public class SliceRange implements TBase
__isset_bit_vector.clear(__COUNT_ISSET_ID);
}
- /** Returns true if field count is set (has been asigned a value) and false otherwise */
+ /** Returns true if field count is set (has been assigned a value) and false otherwise */
public boolean isSetCount() {
return __isset_bit_vector.get(__COUNT_ISSET_ID);
}
@@ -387,7 +381,7 @@ public class SliceRange implements TBase
throw new IllegalStateException();
}
- /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
public boolean isSet(_Fields field) {
if (field == null) {
throw new IllegalArgumentException();
@@ -498,7 +492,7 @@ public class SliceRange implements TBase
return lastComparison;
}
if (isSetStart()) {
- lastComparison = TBaseHelper.compareTo(this.start, typedOther.start);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start, typedOther.start);
if (lastComparison != 0) {
return lastComparison;
}
@@ -508,7 +502,7 @@ public class SliceRange implements TBase
return lastComparison;
}
if (isSetFinish()) {
- lastComparison = TBaseHelper.compareTo(this.finish, typedOther.finish);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.finish, typedOther.finish);
if (lastComparison != 0) {
return lastComparison;
}
@@ -518,7 +512,7 @@ public class SliceRange implements TBase
return lastComparison;
}
if (isSetReversed()) {
- lastComparison = TBaseHelper.compareTo(this.reversed, typedOther.reversed);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reversed, typedOther.reversed);
if (lastComparison != 0) {
return lastComparison;
}
@@ -528,7 +522,7 @@ public class SliceRange implements TBase
return lastComparison;
}
if (isSetCount()) {
- lastComparison = TBaseHelper.compareTo(this.count, typedOther.count);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, typedOther.count);
if (lastComparison != 0) {
return lastComparison;
}
@@ -540,48 +534,48 @@ public class SliceRange implements TBase
return _Fields.findByThriftId(fieldId);
}
- public void read(TProtocol iprot) throws TException {
- TField field;
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField field;
iprot.readStructBegin();
while (true)
{
field = iprot.readFieldBegin();
- if (field.type == TType.STOP) {
+ if (field.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (field.id) {
case 1: // START
- if (field.type == TType.STRING) {
+ if (field.type == org.apache.thrift.protocol.TType.STRING) {
this.start = iprot.readBinary();
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 2: // FINISH
- if (field.type == TType.STRING) {
+ if (field.type == org.apache.thrift.protocol.TType.STRING) {
this.finish = iprot.readBinary();
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 3: // REVERSED
- if (field.type == TType.BOOL) {
+ if (field.type == org.apache.thrift.protocol.TType.BOOL) {
this.reversed = iprot.readBool();
setReversedIsSet(true);
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 4: // COUNT
- if (field.type == TType.I32) {
+ if (field.type == org.apache.thrift.protocol.TType.I32) {
this.count = iprot.readI32();
setCountIsSet(true);
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
default:
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
iprot.readFieldEnd();
}
@@ -589,15 +583,15 @@ public class SliceRange implements TBase
// check for required fields of primitive type, which can't be checked in the validate method
if (!isSetReversed()) {
- throw new TProtocolException("Required field 'reversed' was not found in serialized data! Struct: " + toString());
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'reversed' was not found in serialized data! Struct: " + toString());
}
if (!isSetCount()) {
- throw new TProtocolException("Required field 'count' was not found in serialized data! Struct: " + toString());
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'count' was not found in serialized data! Struct: " + toString());
}
validate();
}
- public void write(TProtocol oprot) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -630,7 +624,7 @@ public class SliceRange implements TBase
if (this.start == null) {
sb.append("null");
} else {
- TBaseHelper.toString(this.start, sb);
+ org.apache.thrift.TBaseHelper.toString(this.start, sb);
}
first = false;
if (!first) sb.append(", ");
@@ -638,7 +632,7 @@ public class SliceRange implements TBase
if (this.finish == null) {
sb.append("null");
} else {
- TBaseHelper.toString(this.finish, sb);
+ org.apache.thrift.TBaseHelper.toString(this.finish, sb);
}
first = false;
if (!first) sb.append(", ");
@@ -653,17 +647,35 @@ public class SliceRange implements TBase
return sb.toString();
}
- public void validate() throws TException {
+ public void validate() throws org.apache.thrift.TException {
// check for required fields
if (start == null) {
- throw new TProtocolException("Required field 'start' was not present! Struct: " + toString());
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'start' was not present! Struct: " + toString());
}
if (finish == null) {
- throw new TProtocolException("Required field 'finish' was not present! Struct: " + toString());
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'finish' was not present! Struct: " + toString());
}
// alas, we cannot check 'reversed' because it's a primitive and you chose the non-beans generator.
// alas, we cannot check 'count' because it's a primitive and you chose the non-beans generator.
}
+ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+ try {
+ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ try {
+ // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+ __isset_bit_vector = new BitSet(1);
+ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
}
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=1090076&r1=1090075&r2=1090076&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 Fri Apr 8 00:47:44 2011
@@ -42,29 +42,23 @@ import java.util.Arrays;
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.*;
-
/**
* A named list of columns.
* @param name. see Column.name.
* @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, SuperColumn._Fields>, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("SuperColumn");
+public class SuperColumn implements org.apache.thrift.TBase<SuperColumn, SuperColumn._Fields>, java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SuperColumn");
- private static final TField NAME_FIELD_DESC = new TField("name", TType.STRING, (short)1);
- private static final TField COLUMNS_FIELD_DESC = new TField("columns", TType.LIST, (short)2);
+ 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;
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements TFieldIdEnum {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
NAME((short)1, "name"),
COLUMNS((short)2, "columns");
@@ -126,16 +120,16 @@ public class SuperColumn implements TBas
// isset id assignments
- public static final Map<_Fields, FieldMetaData> metaDataMap;
+ public static final Map<_Fields, org.apache.thrift.meta_data.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)));
- tmpMap.put(_Fields.COLUMNS, new FieldMetaData("columns", TFieldRequirementType.REQUIRED,
- new ListMetaData(TType.LIST,
- new StructMetaData(TType.STRUCT, Column.class))));
+ Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
+ tmpMap.put(_Fields.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Column.class))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- FieldMetaData.addStructMetaDataMap(SuperColumn.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SuperColumn.class, metaDataMap);
}
public SuperColumn() {
@@ -155,7 +149,7 @@ public class SuperColumn implements TBas
*/
public SuperColumn(SuperColumn other) {
if (other.isSetName()) {
- this.name = TBaseHelper.copyBinary(other.name);
+ this.name = org.apache.thrift.TBaseHelper.copyBinary(other.name);
;
}
if (other.isSetColumns()) {
@@ -178,16 +172,16 @@ public class SuperColumn implements TBas
}
public byte[] getName() {
- setName(TBaseHelper.rightSize(name));
- return name.array();
+ setName(org.apache.thrift.TBaseHelper.rightSize(name));
+ return name == null ? null : name.array();
}
- public ByteBuffer BufferForName() {
+ public ByteBuffer bufferForName() {
return name;
}
public SuperColumn setName(byte[] name) {
- setName(ByteBuffer.wrap(name));
+ setName(name == null ? (ByteBuffer)null : ByteBuffer.wrap(name));
return this;
}
@@ -200,7 +194,7 @@ public class SuperColumn implements TBas
this.name = null;
}
- /** Returns true if field name is set (has been asigned a value) and false otherwise */
+ /** Returns true if field name is set (has been assigned a value) and false otherwise */
public boolean isSetName() {
return this.name != null;
}
@@ -239,7 +233,7 @@ public class SuperColumn implements TBas
this.columns = null;
}
- /** Returns true if field columns is set (has been asigned a value) and false otherwise */
+ /** Returns true if field columns is set (has been assigned a value) and false otherwise */
public boolean isSetColumns() {
return this.columns != null;
}
@@ -283,7 +277,7 @@ public class SuperColumn implements TBas
throw new IllegalStateException();
}
- /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
public boolean isSet(_Fields field) {
if (field == null) {
throw new IllegalArgumentException();
@@ -362,7 +356,7 @@ public class SuperColumn implements TBas
return lastComparison;
}
if (isSetName()) {
- lastComparison = TBaseHelper.compareTo(this.name, typedOther.name);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name);
if (lastComparison != 0) {
return lastComparison;
}
@@ -372,7 +366,7 @@ public class SuperColumn implements TBas
return lastComparison;
}
if (isSetColumns()) {
- lastComparison = TBaseHelper.compareTo(this.columns, typedOther.columns);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns);
if (lastComparison != 0) {
return lastComparison;
}
@@ -384,27 +378,27 @@ public class SuperColumn implements TBas
return _Fields.findByThriftId(fieldId);
}
- public void read(TProtocol iprot) throws TException {
- TField field;
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField field;
iprot.readStructBegin();
while (true)
{
field = iprot.readFieldBegin();
- if (field.type == TType.STOP) {
+ if (field.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (field.id) {
case 1: // NAME
- if (field.type == TType.STRING) {
+ if (field.type == org.apache.thrift.protocol.TType.STRING) {
this.name = iprot.readBinary();
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 2: // COLUMNS
- if (field.type == TType.LIST) {
+ if (field.type == org.apache.thrift.protocol.TType.LIST) {
{
- TList _list0 = iprot.readListBegin();
+ org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
this.columns = new ArrayList<Column>(_list0.size);
for (int _i1 = 0; _i1 < _list0.size; ++_i1)
{
@@ -416,11 +410,11 @@ public class SuperColumn implements TBas
iprot.readListEnd();
}
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
default:
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
iprot.readFieldEnd();
}
@@ -430,7 +424,7 @@ public class SuperColumn implements TBas
validate();
}
- public void write(TProtocol oprot) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -442,7 +436,7 @@ public class SuperColumn implements TBas
if (this.columns != null) {
oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
{
- oprot.writeListBegin(new TList(TType.STRUCT, this.columns.size()));
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.columns.size()));
for (Column _iter3 : this.columns)
{
_iter3.write(oprot);
@@ -464,7 +458,7 @@ public class SuperColumn implements TBas
if (this.name == null) {
sb.append("null");
} else {
- TBaseHelper.toString(this.name, sb);
+ org.apache.thrift.TBaseHelper.toString(this.name, sb);
}
first = false;
if (!first) sb.append(", ");
@@ -479,13 +473,29 @@ public class SuperColumn implements TBas
return sb.toString();
}
- public void validate() throws TException {
+ public void validate() throws org.apache.thrift.TException {
// check for required fields
if (name == null) {
- throw new TProtocolException("Required field 'name' was not present! Struct: " + toString());
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'name' was not present! Struct: " + toString());
}
if (columns == null) {
- throw new TProtocolException("Required field 'columns' was not present! Struct: " + toString());
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'columns' was not present! Struct: " + toString());
+ }
+ }
+
+ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+ try {
+ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ try {
+ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
}
}
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=1090076&r1=1090075&r2=1090076&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 Fri Apr 8 00:47:44 2011
@@ -42,22 +42,16 @@ import java.util.Arrays;
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, TimedOutException._Fields>, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("TimedOutException");
+public class TimedOutException extends Exception implements org.apache.thrift.TBase<TimedOutException, TimedOutException._Fields>, java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TimedOutException");
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements TFieldIdEnum {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
;
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -111,11 +105,11 @@ public class TimedOutException extends E
return _fieldName;
}
}
- public static final Map<_Fields, FieldMetaData> metaDataMap;
+ public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
- Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
+ Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
metaDataMap = Collections.unmodifiableMap(tmpMap);
- FieldMetaData.addStructMetaDataMap(TimedOutException.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TimedOutException.class, metaDataMap);
}
public TimedOutException() {
@@ -146,7 +140,7 @@ public class TimedOutException extends E
throw new IllegalStateException();
}
- /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
public boolean isSet(_Fields field) {
if (field == null) {
throw new IllegalArgumentException();
@@ -195,18 +189,18 @@ public class TimedOutException extends E
return _Fields.findByThriftId(fieldId);
}
- public void read(TProtocol iprot) throws TException {
- TField field;
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField field;
iprot.readStructBegin();
while (true)
{
field = iprot.readFieldBegin();
- if (field.type == TType.STOP) {
+ if (field.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (field.id) {
default:
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
iprot.readFieldEnd();
}
@@ -216,7 +210,7 @@ public class TimedOutException extends E
validate();
}
- public void write(TProtocol oprot) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -233,9 +227,25 @@ public class TimedOutException extends E
return sb.toString();
}
- public void validate() throws TException {
+ public void validate() throws org.apache.thrift.TException {
// check for required fields
}
+ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+ try {
+ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ try {
+ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
}