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 [4/7] -
/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/
Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java?rev=1090076&r1=1090075&r2=1090076&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.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.*;
-
/**
* Methods for fetching rows/records from Cassandra will return either a single instance of ColumnOrSuperColumn or a list
* of ColumnOrSuperColumns (get_slice()). If you're looking up a SuperColumn (or list of SuperColumns) then the resulting
@@ -58,17 +52,17 @@ import org.apache.thrift.protocol.*;
* @param column. The Column returned by get() or get_slice().
* @param super_column. The SuperColumn returned by get() or get_slice().
*/
-public class ColumnOrSuperColumn implements TBase<ColumnOrSuperColumn, ColumnOrSuperColumn._Fields>, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("ColumnOrSuperColumn");
+public class ColumnOrSuperColumn implements org.apache.thrift.TBase<ColumnOrSuperColumn, ColumnOrSuperColumn._Fields>, java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnOrSuperColumn");
- private static final TField COLUMN_FIELD_DESC = new TField("column", TType.STRUCT, (short)1);
- private static final TField SUPER_COLUMN_FIELD_DESC = new TField("super_column", TType.STRUCT, (short)2);
+ private static final org.apache.thrift.protocol.TField COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("column", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+ private static final org.apache.thrift.protocol.TField SUPER_COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("super_column", org.apache.thrift.protocol.TType.STRUCT, (short)2);
public Column column;
public SuperColumn super_column;
/** 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((short)1, "column"),
SUPER_COLUMN((short)2, "super_column");
@@ -130,15 +124,15 @@ public class ColumnOrSuperColumn impleme
// 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, new FieldMetaData("column", TFieldRequirementType.OPTIONAL,
- new StructMetaData(TType.STRUCT, Column.class)));
- tmpMap.put(_Fields.SUPER_COLUMN, new FieldMetaData("super_column", TFieldRequirementType.OPTIONAL,
- new StructMetaData(TType.STRUCT, SuperColumn.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, new org.apache.thrift.meta_data.FieldMetaData("column", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Column.class)));
+ tmpMap.put(_Fields.SUPER_COLUMN, new org.apache.thrift.meta_data.FieldMetaData("super_column", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SuperColumn.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- FieldMetaData.addStructMetaDataMap(ColumnOrSuperColumn.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ColumnOrSuperColumn.class, metaDataMap);
}
public ColumnOrSuperColumn() {
@@ -179,7 +173,7 @@ public class ColumnOrSuperColumn impleme
this.column = null;
}
- /** Returns true if field column is set (has been asigned a value) and false otherwise */
+ /** Returns true if field column is set (has been assigned a value) and false otherwise */
public boolean isSetColumn() {
return this.column != null;
}
@@ -203,7 +197,7 @@ public class ColumnOrSuperColumn impleme
this.super_column = null;
}
- /** Returns true if field super_column is set (has been asigned a value) and false otherwise */
+ /** Returns true if field super_column is set (has been assigned a value) and false otherwise */
public boolean isSetSuper_column() {
return this.super_column != null;
}
@@ -247,7 +241,7 @@ public class ColumnOrSuperColumn impleme
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();
@@ -326,7 +320,7 @@ public class ColumnOrSuperColumn impleme
return lastComparison;
}
if (isSetColumn()) {
- lastComparison = TBaseHelper.compareTo(this.column, typedOther.column);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, typedOther.column);
if (lastComparison != 0) {
return lastComparison;
}
@@ -336,7 +330,7 @@ public class ColumnOrSuperColumn impleme
return lastComparison;
}
if (isSetSuper_column()) {
- lastComparison = TBaseHelper.compareTo(this.super_column, typedOther.super_column);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.super_column, typedOther.super_column);
if (lastComparison != 0) {
return lastComparison;
}
@@ -348,34 +342,34 @@ public class ColumnOrSuperColumn impleme
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
- if (field.type == TType.STRUCT) {
+ if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
this.column = new Column();
this.column.read(iprot);
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 2: // SUPER_COLUMN
- if (field.type == TType.STRUCT) {
+ if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
this.super_column = new SuperColumn();
this.super_column.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();
}
@@ -385,7 +379,7 @@ public class ColumnOrSuperColumn impleme
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);
@@ -435,9 +429,25 @@ public class ColumnOrSuperColumn impleme
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/ColumnParent.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java?rev=1090076&r1=1090075&r2=1090076&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.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.*;
-
/**
* ColumnParent is used when selecting groups of columns from the same ColumnFamily. In directory structure terms, imagine
* ColumnParent as ColumnPath + '/../'.
*
* See also <a href="cassandra.html#Struct_ColumnPath">ColumnPath</a>
*/
-public class ColumnParent implements TBase<ColumnParent, ColumnParent._Fields>, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("ColumnParent");
+public class ColumnParent implements org.apache.thrift.TBase<ColumnParent, ColumnParent._Fields>, java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnParent");
- private static final TField COLUMN_FAMILY_FIELD_DESC = new TField("column_family", TType.STRING, (short)3);
- private static final TField SUPER_COLUMN_FIELD_DESC = new TField("super_column", TType.STRING, (short)4);
+ private static final org.apache.thrift.protocol.TField COLUMN_FAMILY_FIELD_DESC = new org.apache.thrift.protocol.TField("column_family", org.apache.thrift.protocol.TType.STRING, (short)3);
+ private static final org.apache.thrift.protocol.TField SUPER_COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("super_column", org.apache.thrift.protocol.TType.STRING, (short)4);
public String column_family;
public ByteBuffer super_column;
/** 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_FAMILY((short)3, "column_family"),
SUPER_COLUMN((short)4, "super_column");
@@ -126,15 +120,15 @@ public class ColumnParent implements TBa
// 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_FAMILY, new FieldMetaData("column_family", TFieldRequirementType.REQUIRED,
- new FieldValueMetaData(TType.STRING)));
- tmpMap.put(_Fields.SUPER_COLUMN, new FieldMetaData("super_column", TFieldRequirementType.OPTIONAL,
- new FieldValueMetaData(TType.STRING)));
+ Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.COLUMN_FAMILY, new org.apache.thrift.meta_data.FieldMetaData("column_family", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.SUPER_COLUMN, new org.apache.thrift.meta_data.FieldMetaData("super_column", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- FieldMetaData.addStructMetaDataMap(ColumnParent.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ColumnParent.class, metaDataMap);
}
public ColumnParent() {
@@ -155,7 +149,7 @@ public class ColumnParent implements TBa
this.column_family = other.column_family;
}
if (other.isSetSuper_column()) {
- this.super_column = TBaseHelper.copyBinary(other.super_column);
+ this.super_column = org.apache.thrift.TBaseHelper.copyBinary(other.super_column);
;
}
}
@@ -183,7 +177,7 @@ public class ColumnParent implements TBa
this.column_family = null;
}
- /** Returns true if field column_family is set (has been asigned a value) and false otherwise */
+ /** Returns true if field column_family is set (has been assigned a value) and false otherwise */
public boolean isSetColumn_family() {
return this.column_family != null;
}
@@ -195,16 +189,16 @@ public class ColumnParent implements TBa
}
public byte[] getSuper_column() {
- setSuper_column(TBaseHelper.rightSize(super_column));
- return super_column.array();
+ setSuper_column(org.apache.thrift.TBaseHelper.rightSize(super_column));
+ return super_column == null ? null : super_column.array();
}
- public ByteBuffer BufferForSuper_column() {
+ public ByteBuffer bufferForSuper_column() {
return super_column;
}
public ColumnParent setSuper_column(byte[] super_column) {
- setSuper_column(ByteBuffer.wrap(super_column));
+ setSuper_column(super_column == null ? (ByteBuffer)null : ByteBuffer.wrap(super_column));
return this;
}
@@ -217,7 +211,7 @@ public class ColumnParent implements TBa
this.super_column = null;
}
- /** Returns true if field super_column is set (has been asigned a value) and false otherwise */
+ /** Returns true if field super_column is set (has been assigned a value) and false otherwise */
public boolean isSetSuper_column() {
return this.super_column != null;
}
@@ -261,7 +255,7 @@ public class ColumnParent implements TBa
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();
@@ -340,7 +334,7 @@ public class ColumnParent implements TBa
return lastComparison;
}
if (isSetColumn_family()) {
- lastComparison = TBaseHelper.compareTo(this.column_family, typedOther.column_family);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_family, typedOther.column_family);
if (lastComparison != 0) {
return lastComparison;
}
@@ -350,7 +344,7 @@ public class ColumnParent implements TBa
return lastComparison;
}
if (isSetSuper_column()) {
- lastComparison = TBaseHelper.compareTo(this.super_column, typedOther.super_column);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.super_column, typedOther.super_column);
if (lastComparison != 0) {
return lastComparison;
}
@@ -362,32 +356,32 @@ public class ColumnParent implements TBa
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 3: // COLUMN_FAMILY
- if (field.type == TType.STRING) {
+ if (field.type == org.apache.thrift.protocol.TType.STRING) {
this.column_family = iprot.readString();
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 4: // SUPER_COLUMN
- if (field.type == TType.STRING) {
+ if (field.type == org.apache.thrift.protocol.TType.STRING) {
this.super_column = iprot.readBinary();
} 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();
}
@@ -397,7 +391,7 @@ public class ColumnParent implements TBa
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);
@@ -435,7 +429,7 @@ public class ColumnParent implements TBa
if (this.super_column == null) {
sb.append("null");
} else {
- TBaseHelper.toString(this.super_column, sb);
+ org.apache.thrift.TBaseHelper.toString(this.super_column, sb);
}
first = false;
}
@@ -443,10 +437,26 @@ public class ColumnParent implements TBa
return sb.toString();
}
- public void validate() throws TException {
+ public void validate() throws org.apache.thrift.TException {
// check for required fields
if (column_family == null) {
- throw new TProtocolException("Required field 'column_family' was not present! Struct: " + toString());
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'column_family' 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/ColumnPath.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java?rev=1090076&r1=1090075&r2=1090076&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.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.*;
-
/**
* The ColumnPath is the path to a single column in Cassandra. It might make sense to think of ColumnPath and
* ColumnParent in terms of a directory structure.
@@ -58,19 +52,19 @@ import org.apache.thrift.protocol.*;
* @param super_column. The super column name.
* @param column. The column name.
*/
-public class ColumnPath implements TBase<ColumnPath, ColumnPath._Fields>, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("ColumnPath");
+public class ColumnPath implements org.apache.thrift.TBase<ColumnPath, ColumnPath._Fields>, java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnPath");
- private static final TField COLUMN_FAMILY_FIELD_DESC = new TField("column_family", TType.STRING, (short)3);
- private static final TField SUPER_COLUMN_FIELD_DESC = new TField("super_column", TType.STRING, (short)4);
- private static final TField COLUMN_FIELD_DESC = new TField("column", TType.STRING, (short)5);
+ private static final org.apache.thrift.protocol.TField COLUMN_FAMILY_FIELD_DESC = new org.apache.thrift.protocol.TField("column_family", org.apache.thrift.protocol.TType.STRING, (short)3);
+ private static final org.apache.thrift.protocol.TField SUPER_COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("super_column", org.apache.thrift.protocol.TType.STRING, (short)4);
+ private static final org.apache.thrift.protocol.TField COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("column", org.apache.thrift.protocol.TType.STRING, (short)5);
public String column_family;
public ByteBuffer super_column;
public ByteBuffer column;
/** 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_FAMILY((short)3, "column_family"),
SUPER_COLUMN((short)4, "super_column"),
COLUMN((short)5, "column");
@@ -135,17 +129,17 @@ public class ColumnPath implements TBase
// 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_FAMILY, new FieldMetaData("column_family", TFieldRequirementType.REQUIRED,
- new FieldValueMetaData(TType.STRING)));
- tmpMap.put(_Fields.SUPER_COLUMN, new FieldMetaData("super_column", TFieldRequirementType.OPTIONAL,
- new FieldValueMetaData(TType.STRING)));
- tmpMap.put(_Fields.COLUMN, new FieldMetaData("column", TFieldRequirementType.OPTIONAL,
- new FieldValueMetaData(TType.STRING)));
+ Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.COLUMN_FAMILY, new org.apache.thrift.meta_data.FieldMetaData("column_family", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.SUPER_COLUMN, new org.apache.thrift.meta_data.FieldMetaData("super_column", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
+ tmpMap.put(_Fields.COLUMN, new org.apache.thrift.meta_data.FieldMetaData("column", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- FieldMetaData.addStructMetaDataMap(ColumnPath.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ColumnPath.class, metaDataMap);
}
public ColumnPath() {
@@ -166,11 +160,11 @@ public class ColumnPath implements TBase
this.column_family = other.column_family;
}
if (other.isSetSuper_column()) {
- this.super_column = TBaseHelper.copyBinary(other.super_column);
+ this.super_column = org.apache.thrift.TBaseHelper.copyBinary(other.super_column);
;
}
if (other.isSetColumn()) {
- this.column = TBaseHelper.copyBinary(other.column);
+ this.column = org.apache.thrift.TBaseHelper.copyBinary(other.column);
;
}
}
@@ -199,7 +193,7 @@ public class ColumnPath implements TBase
this.column_family = null;
}
- /** Returns true if field column_family is set (has been asigned a value) and false otherwise */
+ /** Returns true if field column_family is set (has been assigned a value) and false otherwise */
public boolean isSetColumn_family() {
return this.column_family != null;
}
@@ -211,16 +205,16 @@ public class ColumnPath implements TBase
}
public byte[] getSuper_column() {
- setSuper_column(TBaseHelper.rightSize(super_column));
- return super_column.array();
+ setSuper_column(org.apache.thrift.TBaseHelper.rightSize(super_column));
+ return super_column == null ? null : super_column.array();
}
- public ByteBuffer BufferForSuper_column() {
+ public ByteBuffer bufferForSuper_column() {
return super_column;
}
public ColumnPath setSuper_column(byte[] super_column) {
- setSuper_column(ByteBuffer.wrap(super_column));
+ setSuper_column(super_column == null ? (ByteBuffer)null : ByteBuffer.wrap(super_column));
return this;
}
@@ -233,7 +227,7 @@ public class ColumnPath implements TBase
this.super_column = null;
}
- /** Returns true if field super_column is set (has been asigned a value) and false otherwise */
+ /** Returns true if field super_column is set (has been assigned a value) and false otherwise */
public boolean isSetSuper_column() {
return this.super_column != null;
}
@@ -245,16 +239,16 @@ public class ColumnPath implements TBase
}
public byte[] getColumn() {
- setColumn(TBaseHelper.rightSize(column));
- return column.array();
+ setColumn(org.apache.thrift.TBaseHelper.rightSize(column));
+ return column == null ? null : column.array();
}
- public ByteBuffer BufferForColumn() {
+ public ByteBuffer bufferForColumn() {
return column;
}
public ColumnPath setColumn(byte[] column) {
- setColumn(ByteBuffer.wrap(column));
+ setColumn(column == null ? (ByteBuffer)null : ByteBuffer.wrap(column));
return this;
}
@@ -267,7 +261,7 @@ public class ColumnPath implements TBase
this.column = null;
}
- /** Returns true if field column is set (has been asigned a value) and false otherwise */
+ /** Returns true if field column is set (has been assigned a value) and false otherwise */
public boolean isSetColumn() {
return this.column != null;
}
@@ -322,7 +316,7 @@ public class ColumnPath 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();
@@ -417,7 +411,7 @@ public class ColumnPath implements TBase
return lastComparison;
}
if (isSetColumn_family()) {
- lastComparison = TBaseHelper.compareTo(this.column_family, typedOther.column_family);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_family, typedOther.column_family);
if (lastComparison != 0) {
return lastComparison;
}
@@ -427,7 +421,7 @@ public class ColumnPath implements TBase
return lastComparison;
}
if (isSetSuper_column()) {
- lastComparison = TBaseHelper.compareTo(this.super_column, typedOther.super_column);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.super_column, typedOther.super_column);
if (lastComparison != 0) {
return lastComparison;
}
@@ -437,7 +431,7 @@ public class ColumnPath implements TBase
return lastComparison;
}
if (isSetColumn()) {
- lastComparison = TBaseHelper.compareTo(this.column, typedOther.column);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, typedOther.column);
if (lastComparison != 0) {
return lastComparison;
}
@@ -449,39 +443,39 @@ public class ColumnPath 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 3: // COLUMN_FAMILY
- if (field.type == TType.STRING) {
+ if (field.type == org.apache.thrift.protocol.TType.STRING) {
this.column_family = iprot.readString();
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 4: // SUPER_COLUMN
- if (field.type == TType.STRING) {
+ if (field.type == org.apache.thrift.protocol.TType.STRING) {
this.super_column = iprot.readBinary();
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 5: // COLUMN
- if (field.type == TType.STRING) {
+ if (field.type == org.apache.thrift.protocol.TType.STRING) {
this.column = iprot.readBinary();
} 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();
}
@@ -491,7 +485,7 @@ public class ColumnPath implements TBase
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);
@@ -536,7 +530,7 @@ public class ColumnPath implements TBase
if (this.super_column == null) {
sb.append("null");
} else {
- TBaseHelper.toString(this.super_column, sb);
+ org.apache.thrift.TBaseHelper.toString(this.super_column, sb);
}
first = false;
}
@@ -546,7 +540,7 @@ public class ColumnPath implements TBase
if (this.column == null) {
sb.append("null");
} else {
- TBaseHelper.toString(this.column, sb);
+ org.apache.thrift.TBaseHelper.toString(this.column, sb);
}
first = false;
}
@@ -554,10 +548,26 @@ public class ColumnPath implements TBase
return sb.toString();
}
- public void validate() throws TException {
+ public void validate() throws org.apache.thrift.TException {
// check for required fields
if (column_family == null) {
- throw new TProtocolException("Required field 'column_family' was not present! Struct: " + toString());
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'column_family' 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/Compression.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Compression.java?rev=1090076&r1=1090075&r2=1090076&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Compression.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Compression.java Fri Apr 8 00:47:44 2011
@@ -34,7 +34,7 @@ import org.apache.thrift.TEnum;
/**
* CQL query compression
*/
-public enum Compression implements TEnum {
+public enum Compression implements org.apache.thrift.TEnum {
GZIP(1);
private final int value;
Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java?rev=1090076&r1=1090075&r2=1090076&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java Fri Apr 8 00:47:44 2011
@@ -73,7 +73,7 @@ import org.apache.thrift.TEnum;
* EACH_QUORUM Returns the record with the most recent timestamp once a majority of replicas within each datacenter have replied.
* ALL Returns the record with the most recent timestamp once all replicas have replied (implies no replica may be down)..
*/
-public enum ConsistencyLevel implements TEnum {
+public enum ConsistencyLevel implements org.apache.thrift.TEnum {
ONE(1),
QUORUM(2),
LOCAL_QUORUM(3),
Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Counter.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Counter.java?rev=1090076&r1=1090075&r2=1090076&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Counter.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Counter.java Fri Apr 8 00:47:44 2011
@@ -42,23 +42,17 @@ 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 Counter implements org.apache.thrift.TBase<Counter, Counter._Fields>, java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Counter");
-public class Counter implements TBase<Counter, Counter._Fields>, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("Counter");
-
- private static final TField COLUMN_FIELD_DESC = new TField("column", TType.STRUCT, (short)1);
- private static final TField SUPER_COLUMN_FIELD_DESC = new TField("super_column", TType.STRUCT, (short)2);
+ private static final org.apache.thrift.protocol.TField COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("column", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+ private static final org.apache.thrift.protocol.TField SUPER_COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("super_column", org.apache.thrift.protocol.TType.STRUCT, (short)2);
public CounterColumn column;
public CounterSuperColumn super_column;
/** 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((short)1, "column"),
SUPER_COLUMN((short)2, "super_column");
@@ -120,15 +114,15 @@ public class Counter implements TBase<Co
// 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, new FieldMetaData("column", TFieldRequirementType.OPTIONAL,
- new StructMetaData(TType.STRUCT, CounterColumn.class)));
- tmpMap.put(_Fields.SUPER_COLUMN, new FieldMetaData("super_column", TFieldRequirementType.OPTIONAL,
- new StructMetaData(TType.STRUCT, CounterSuperColumn.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, new org.apache.thrift.meta_data.FieldMetaData("column", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, CounterColumn.class)));
+ tmpMap.put(_Fields.SUPER_COLUMN, new org.apache.thrift.meta_data.FieldMetaData("super_column", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, CounterSuperColumn.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- FieldMetaData.addStructMetaDataMap(Counter.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Counter.class, metaDataMap);
}
public Counter() {
@@ -169,7 +163,7 @@ public class Counter implements TBase<Co
this.column = null;
}
- /** Returns true if field column is set (has been asigned a value) and false otherwise */
+ /** Returns true if field column is set (has been assigned a value) and false otherwise */
public boolean isSetColumn() {
return this.column != null;
}
@@ -193,7 +187,7 @@ public class Counter implements TBase<Co
this.super_column = null;
}
- /** Returns true if field super_column is set (has been asigned a value) and false otherwise */
+ /** Returns true if field super_column is set (has been assigned a value) and false otherwise */
public boolean isSetSuper_column() {
return this.super_column != null;
}
@@ -237,7 +231,7 @@ public class Counter implements TBase<Co
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();
@@ -316,7 +310,7 @@ public class Counter implements TBase<Co
return lastComparison;
}
if (isSetColumn()) {
- lastComparison = TBaseHelper.compareTo(this.column, typedOther.column);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, typedOther.column);
if (lastComparison != 0) {
return lastComparison;
}
@@ -326,7 +320,7 @@ public class Counter implements TBase<Co
return lastComparison;
}
if (isSetSuper_column()) {
- lastComparison = TBaseHelper.compareTo(this.super_column, typedOther.super_column);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.super_column, typedOther.super_column);
if (lastComparison != 0) {
return lastComparison;
}
@@ -338,34 +332,34 @@ public class Counter implements TBase<Co
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
- if (field.type == TType.STRUCT) {
+ if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
this.column = new CounterColumn();
this.column.read(iprot);
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 2: // SUPER_COLUMN
- if (field.type == TType.STRUCT) {
+ if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
this.super_column = new CounterSuperColumn();
this.super_column.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();
}
@@ -375,7 +369,7 @@ public class Counter implements TBase<Co
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);
@@ -425,9 +419,25 @@ public class Counter implements TBase<Co
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/CounterColumn.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterColumn.java?rev=1090076&r1=1090075&r2=1090076&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterColumn.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterColumn.java Fri Apr 8 00:47:44 2011
@@ -42,23 +42,17 @@ 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 CounterColumn implements org.apache.thrift.TBase<CounterColumn, CounterColumn._Fields>, java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CounterColumn");
-public class CounterColumn implements TBase<CounterColumn, CounterColumn._Fields>, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("CounterColumn");
-
- private static final TField NAME_FIELD_DESC = new TField("name", TType.STRING, (short)1);
- private static final TField VALUE_FIELD_DESC = new TField("value", TType.I64, (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 VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.I64, (short)2);
public ByteBuffer name;
public long value;
/** 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"),
VALUE((short)2, "value");
@@ -122,15 +116,15 @@ public class CounterColumn implements TB
private static final int __VALUE_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.VALUE, new FieldMetaData("value", TFieldRequirementType.REQUIRED,
- new FieldValueMetaData(TType.I64)));
+ 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.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- FieldMetaData.addStructMetaDataMap(CounterColumn.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CounterColumn.class, metaDataMap);
}
public CounterColumn() {
@@ -153,7 +147,7 @@ public class CounterColumn implements TB
__isset_bit_vector.clear();
__isset_bit_vector.or(other.__isset_bit_vector);
if (other.isSetName()) {
- this.name = TBaseHelper.copyBinary(other.name);
+ this.name = org.apache.thrift.TBaseHelper.copyBinary(other.name);
;
}
this.value = other.value;
@@ -171,16 +165,16 @@ public class CounterColumn implements TB
}
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 CounterColumn setName(byte[] name) {
- setName(ByteBuffer.wrap(name));
+ setName(name == null ? (ByteBuffer)null : ByteBuffer.wrap(name));
return this;
}
@@ -193,7 +187,7 @@ public class CounterColumn implements TB
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;
}
@@ -218,7 +212,7 @@ public class CounterColumn implements TB
__isset_bit_vector.clear(__VALUE_ISSET_ID);
}
- /** Returns true if field value is set (has been asigned a value) and false otherwise */
+ /** Returns true if field value is set (has been assigned a value) and false otherwise */
public boolean isSetValue() {
return __isset_bit_vector.get(__VALUE_ISSET_ID);
}
@@ -260,7 +254,7 @@ public class CounterColumn implements TB
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();
@@ -339,7 +333,7 @@ public class CounterColumn implements TB
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;
}
@@ -349,7 +343,7 @@ public class CounterColumn implements TB
return lastComparison;
}
if (isSetValue()) {
- lastComparison = TBaseHelper.compareTo(this.value, typedOther.value);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, typedOther.value);
if (lastComparison != 0) {
return lastComparison;
}
@@ -361,33 +355,33 @@ public class CounterColumn implements TB
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: // VALUE
- if (field.type == TType.I64) {
+ if (field.type == org.apache.thrift.protocol.TType.I64) {
this.value = iprot.readI64();
setValueIsSet(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();
}
@@ -395,12 +389,12 @@ public class CounterColumn implements TB
// check for required fields of primitive type, which can't be checked in the validate method
if (!isSetValue()) {
- throw new TProtocolException("Required field 'value' was not found in serialized data! Struct: " + toString());
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'value' 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);
@@ -425,7 +419,7 @@ public class CounterColumn implements TB
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(", ");
@@ -436,13 +430,31 @@ public class CounterColumn implements TB
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());
}
// alas, we cannot check 'value' 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/CounterSuperColumn.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterSuperColumn.java?rev=1090076&r1=1090075&r2=1090076&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterSuperColumn.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterSuperColumn.java Fri Apr 8 00:47:44 2011
@@ -42,23 +42,17 @@ 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 CounterSuperColumn implements org.apache.thrift.TBase<CounterSuperColumn, CounterSuperColumn._Fields>, java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CounterSuperColumn");
-public class CounterSuperColumn implements TBase<CounterSuperColumn, CounterSuperColumn._Fields>, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("CounterSuperColumn");
-
- 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<CounterColumn> 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");
@@ -120,16 +114,16 @@ public class CounterSuperColumn implemen
// 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, CounterColumn.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, CounterColumn.class))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- FieldMetaData.addStructMetaDataMap(CounterSuperColumn.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CounterSuperColumn.class, metaDataMap);
}
public CounterSuperColumn() {
@@ -149,7 +143,7 @@ public class CounterSuperColumn implemen
*/
public CounterSuperColumn(CounterSuperColumn other) {
if (other.isSetName()) {
- this.name = TBaseHelper.copyBinary(other.name);
+ this.name = org.apache.thrift.TBaseHelper.copyBinary(other.name);
;
}
if (other.isSetColumns()) {
@@ -172,16 +166,16 @@ public class CounterSuperColumn implemen
}
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 CounterSuperColumn setName(byte[] name) {
- setName(ByteBuffer.wrap(name));
+ setName(name == null ? (ByteBuffer)null : ByteBuffer.wrap(name));
return this;
}
@@ -194,7 +188,7 @@ public class CounterSuperColumn implemen
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;
}
@@ -233,7 +227,7 @@ public class CounterSuperColumn implemen
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;
}
@@ -277,7 +271,7 @@ public class CounterSuperColumn implemen
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();
@@ -356,7 +350,7 @@ public class CounterSuperColumn implemen
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;
}
@@ -366,7 +360,7 @@ public class CounterSuperColumn implemen
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;
}
@@ -378,27 +372,27 @@ public class CounterSuperColumn implemen
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 _list4 = iprot.readListBegin();
+ org.apache.thrift.protocol.TList _list4 = iprot.readListBegin();
this.columns = new ArrayList<CounterColumn>(_list4.size);
for (int _i5 = 0; _i5 < _list4.size; ++_i5)
{
@@ -410,11 +404,11 @@ public class CounterSuperColumn implemen
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();
}
@@ -424,7 +418,7 @@ public class CounterSuperColumn implemen
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);
@@ -436,7 +430,7 @@ public class CounterSuperColumn implemen
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 (CounterColumn _iter7 : this.columns)
{
_iter7.write(oprot);
@@ -458,7 +452,7 @@ public class CounterSuperColumn implemen
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(", ");
@@ -473,13 +467,29 @@ public class CounterSuperColumn implemen
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/CqlResult.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java?rev=1090076&r1=1090075&r2=1090076&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java Fri Apr 8 00:47:44 2011
@@ -42,18 +42,12 @@ 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 CqlResult implements TBase<CqlResult, CqlResult._Fields>, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("CqlResult");
-
- private static final TField TYPE_FIELD_DESC = new TField("type", TType.I32, (short)1);
- private static final TField ROWS_FIELD_DESC = new TField("rows", TType.LIST, (short)2);
- private static final TField NUM_FIELD_DESC = new TField("num", TType.I32, (short)3);
+public class CqlResult implements org.apache.thrift.TBase<CqlResult, CqlResult._Fields>, java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CqlResult");
+
+ private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)1);
+ private static final org.apache.thrift.protocol.TField ROWS_FIELD_DESC = new org.apache.thrift.protocol.TField("rows", org.apache.thrift.protocol.TType.LIST, (short)2);
+ private static final org.apache.thrift.protocol.TField NUM_FIELD_DESC = new org.apache.thrift.protocol.TField("num", org.apache.thrift.protocol.TType.I32, (short)3);
/**
*
@@ -64,7 +58,7 @@ public class CqlResult implements TBase<
public int num;
/** 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 {
/**
*
* @see CqlResultType
@@ -135,18 +129,18 @@ public class CqlResult implements TBase<
private static final int __NUM_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.TYPE, new FieldMetaData("type", TFieldRequirementType.REQUIRED,
- new EnumMetaData(TType.ENUM, CqlResultType.class)));
- tmpMap.put(_Fields.ROWS, new FieldMetaData("rows", TFieldRequirementType.OPTIONAL,
- new ListMetaData(TType.LIST,
- new StructMetaData(TType.STRUCT, CqlRow.class))));
- tmpMap.put(_Fields.NUM, new FieldMetaData("num", TFieldRequirementType.OPTIONAL,
- 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.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, CqlResultType.class)));
+ tmpMap.put(_Fields.ROWS, new org.apache.thrift.meta_data.FieldMetaData("rows", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ 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, CqlRow.class))));
+ tmpMap.put(_Fields.NUM, new org.apache.thrift.meta_data.FieldMetaData("num", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- FieldMetaData.addStructMetaDataMap(CqlResult.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CqlResult.class, metaDataMap);
}
public CqlResult() {
@@ -211,7 +205,7 @@ public class CqlResult implements TBase<
this.type = null;
}
- /** Returns true if field type is set (has been asigned a value) and false otherwise */
+ /** Returns true if field type is set (has been assigned a value) and false otherwise */
public boolean isSetType() {
return this.type != null;
}
@@ -250,7 +244,7 @@ public class CqlResult implements TBase<
this.rows = null;
}
- /** Returns true if field rows is set (has been asigned a value) and false otherwise */
+ /** Returns true if field rows is set (has been assigned a value) and false otherwise */
public boolean isSetRows() {
return this.rows != null;
}
@@ -275,7 +269,7 @@ public class CqlResult implements TBase<
__isset_bit_vector.clear(__NUM_ISSET_ID);
}
- /** Returns true if field num is set (has been asigned a value) and false otherwise */
+ /** Returns true if field num is set (has been assigned a value) and false otherwise */
public boolean isSetNum() {
return __isset_bit_vector.get(__NUM_ISSET_ID);
}
@@ -328,7 +322,7 @@ public class CqlResult 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();
@@ -423,7 +417,7 @@ public class CqlResult implements TBase<
return lastComparison;
}
if (isSetType()) {
- lastComparison = TBaseHelper.compareTo(this.type, typedOther.type);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, typedOther.type);
if (lastComparison != 0) {
return lastComparison;
}
@@ -433,7 +427,7 @@ public class CqlResult implements TBase<
return lastComparison;
}
if (isSetRows()) {
- lastComparison = TBaseHelper.compareTo(this.rows, typedOther.rows);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rows, typedOther.rows);
if (lastComparison != 0) {
return lastComparison;
}
@@ -443,7 +437,7 @@ public class CqlResult implements TBase<
return lastComparison;
}
if (isSetNum()) {
- lastComparison = TBaseHelper.compareTo(this.num, typedOther.num);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num, typedOther.num);
if (lastComparison != 0) {
return lastComparison;
}
@@ -455,27 +449,27 @@ public class CqlResult 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: // TYPE
- if (field.type == TType.I32) {
+ if (field.type == org.apache.thrift.protocol.TType.I32) {
this.type = CqlResultType.findByValue(iprot.readI32());
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 2: // ROWS
- if (field.type == TType.LIST) {
+ if (field.type == org.apache.thrift.protocol.TType.LIST) {
{
- TList _list46 = iprot.readListBegin();
+ org.apache.thrift.protocol.TList _list46 = iprot.readListBegin();
this.rows = new ArrayList<CqlRow>(_list46.size);
for (int _i47 = 0; _i47 < _list46.size; ++_i47)
{
@@ -487,19 +481,19 @@ public class CqlResult implements TBase<
iprot.readListEnd();
}
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 3: // NUM
- if (field.type == TType.I32) {
+ if (field.type == org.apache.thrift.protocol.TType.I32) {
this.num = iprot.readI32();
setNumIsSet(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();
}
@@ -509,7 +503,7 @@ public class CqlResult implements TBase<
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);
@@ -522,7 +516,7 @@ public class CqlResult implements TBase<
if (isSetRows()) {
oprot.writeFieldBegin(ROWS_FIELD_DESC);
{
- oprot.writeListBegin(new TList(TType.STRUCT, this.rows.size()));
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.rows.size()));
for (CqlRow _iter49 : this.rows)
{
_iter49.write(oprot);
@@ -573,10 +567,28 @@ public class CqlResult implements TBase<
return sb.toString();
}
- public void validate() throws TException {
+ public void validate() throws org.apache.thrift.TException {
// check for required fields
if (type == null) {
- throw new TProtocolException("Required field 'type' was not present! Struct: " + toString());
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'type' 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/CqlResultType.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java?rev=1090076&r1=1090075&r2=1090076&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java Fri Apr 8 00:47:44 2011
@@ -31,7 +31,7 @@ import java.util.Map;
import java.util.HashMap;
import org.apache.thrift.TEnum;
-public enum CqlResultType implements TEnum {
+public enum CqlResultType implements org.apache.thrift.TEnum {
ROWS(1),
VOID(2),
INT(3);
Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java?rev=1090076&r1=1090075&r2=1090076&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java Fri Apr 8 00:47:44 2011
@@ -42,26 +42,20 @@ 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.*;
-
/**
* Row returned from a CQL query
*/
-public class CqlRow implements TBase<CqlRow, CqlRow._Fields>, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("CqlRow");
+public class CqlRow implements org.apache.thrift.TBase<CqlRow, CqlRow._Fields>, java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CqlRow");
- private static final TField KEY_FIELD_DESC = new TField("key", 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 KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("key", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.LIST, (short)2);
public ByteBuffer key;
public List<Column> columns;
/** 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 {
KEY((short)1, "key"),
COLUMNS((short)2, "columns");
@@ -123,16 +117,16 @@ public class CqlRow implements TBase<Cql
// 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.KEY, new FieldMetaData("key", 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.KEY, new org.apache.thrift.meta_data.FieldMetaData("key", 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(CqlRow.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CqlRow.class, metaDataMap);
}
public CqlRow() {
@@ -152,7 +146,7 @@ public class CqlRow implements TBase<Cql
*/
public CqlRow(CqlRow other) {
if (other.isSetKey()) {
- this.key = TBaseHelper.copyBinary(other.key);
+ this.key = org.apache.thrift.TBaseHelper.copyBinary(other.key);
;
}
if (other.isSetColumns()) {
@@ -175,16 +169,16 @@ public class CqlRow implements TBase<Cql
}
public byte[] getKey() {
- setKey(TBaseHelper.rightSize(key));
- return key.array();
+ setKey(org.apache.thrift.TBaseHelper.rightSize(key));
+ return key == null ? null : key.array();
}
- public ByteBuffer BufferForKey() {
+ public ByteBuffer bufferForKey() {
return key;
}
public CqlRow setKey(byte[] key) {
- setKey(ByteBuffer.wrap(key));
+ setKey(key == null ? (ByteBuffer)null : ByteBuffer.wrap(key));
return this;
}
@@ -197,7 +191,7 @@ public class CqlRow implements TBase<Cql
this.key = null;
}
- /** Returns true if field key is set (has been asigned a value) and false otherwise */
+ /** Returns true if field key is set (has been assigned a value) and false otherwise */
public boolean isSetKey() {
return this.key != null;
}
@@ -236,7 +230,7 @@ public class CqlRow implements TBase<Cql
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;
}
@@ -280,7 +274,7 @@ public class CqlRow implements TBase<Cql
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();
@@ -359,7 +353,7 @@ public class CqlRow implements TBase<Cql
return lastComparison;
}
if (isSetKey()) {
- lastComparison = TBaseHelper.compareTo(this.key, typedOther.key);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, typedOther.key);
if (lastComparison != 0) {
return lastComparison;
}
@@ -369,7 +363,7 @@ public class CqlRow implements TBase<Cql
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;
}
@@ -381,27 +375,27 @@ public class CqlRow implements TBase<Cql
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: // KEY
- if (field.type == TType.STRING) {
+ if (field.type == org.apache.thrift.protocol.TType.STRING) {
this.key = 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 _list42 = iprot.readListBegin();
+ org.apache.thrift.protocol.TList _list42 = iprot.readListBegin();
this.columns = new ArrayList<Column>(_list42.size);
for (int _i43 = 0; _i43 < _list42.size; ++_i43)
{
@@ -413,11 +407,11 @@ public class CqlRow implements TBase<Cql
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();
}
@@ -427,7 +421,7 @@ public class CqlRow implements TBase<Cql
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);
@@ -439,7 +433,7 @@ public class CqlRow implements TBase<Cql
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 _iter45 : this.columns)
{
_iter45.write(oprot);
@@ -461,7 +455,7 @@ public class CqlRow implements TBase<Cql
if (this.key == null) {
sb.append("null");
} else {
- TBaseHelper.toString(this.key, sb);
+ org.apache.thrift.TBaseHelper.toString(this.key, sb);
}
first = false;
if (!first) sb.append(", ");
@@ -476,13 +470,29 @@ public class CqlRow implements TBase<Cql
return sb.toString();
}
- public void validate() throws TException {
+ public void validate() throws org.apache.thrift.TException {
// check for required fields
if (key == null) {
- throw new TProtocolException("Required field 'key' was not present! Struct: " + toString());
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'key' 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);
}
}