cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [18/26] cassandra git commit: Thrift removal
Date Tue, 13 Dec 2016 09:27:42 GMT
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlPreparedResult.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlPreparedResult.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlPreparedResult.java
deleted file mode 100644
index b720a2d..0000000
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlPreparedResult.java
+++ /dev/null
@@ -1,821 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.cassandra.thrift;
-/*
- * 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- */
-
-
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CqlPreparedResult implements org.apache.thrift.TBase<CqlPreparedResult, CqlPreparedResult._Fields>, java.io.Serializable, Cloneable, Comparable<CqlPreparedResult> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CqlPreparedResult");
-
-  private static final org.apache.thrift.protocol.TField ITEM_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("itemId", org.apache.thrift.protocol.TType.I32, (short)1);
-  private static final org.apache.thrift.protocol.TField COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("count", org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField VARIABLE_TYPES_FIELD_DESC = new org.apache.thrift.protocol.TField("variable_types", org.apache.thrift.protocol.TType.LIST, (short)3);
-  private static final org.apache.thrift.protocol.TField VARIABLE_NAMES_FIELD_DESC = new org.apache.thrift.protocol.TField("variable_names", org.apache.thrift.protocol.TType.LIST, (short)4);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new CqlPreparedResultStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new CqlPreparedResultTupleSchemeFactory());
-  }
-
-  public int itemId; // required
-  public int count; // required
-  public List<String> variable_types; // optional
-  public List<String> variable_names; // optional
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    ITEM_ID((short)1, "itemId"),
-    COUNT((short)2, "count"),
-    VARIABLE_TYPES((short)3, "variable_types"),
-    VARIABLE_NAMES((short)4, "variable_names");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // ITEM_ID
-          return ITEM_ID;
-        case 2: // COUNT
-          return COUNT;
-        case 3: // VARIABLE_TYPES
-          return VARIABLE_TYPES;
-        case 4: // VARIABLE_NAMES
-          return VARIABLE_NAMES;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final int __ITEMID_ISSET_ID = 0;
-  private static final int __COUNT_ISSET_ID = 1;
-  private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.VARIABLE_TYPES,_Fields.VARIABLE_NAMES};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.ITEM_ID, new org.apache.thrift.meta_data.FieldMetaData("itemId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    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)));
-    tmpMap.put(_Fields.VARIABLE_TYPES, new org.apache.thrift.meta_data.FieldMetaData("variable_types", 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))));
-    tmpMap.put(_Fields.VARIABLE_NAMES, new org.apache.thrift.meta_data.FieldMetaData("variable_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))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CqlPreparedResult.class, metaDataMap);
-  }
-
-  public CqlPreparedResult() {
-  }
-
-  public CqlPreparedResult(
-    int itemId,
-    int count)
-  {
-    this();
-    this.itemId = itemId;
-    setItemIdIsSet(true);
-    this.count = count;
-    setCountIsSet(true);
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public CqlPreparedResult(CqlPreparedResult other) {
-    __isset_bitfield = other.__isset_bitfield;
-    this.itemId = other.itemId;
-    this.count = other.count;
-    if (other.isSetVariable_types()) {
-      List<String> __this__variable_types = new ArrayList<String>(other.variable_types);
-      this.variable_types = __this__variable_types;
-    }
-    if (other.isSetVariable_names()) {
-      List<String> __this__variable_names = new ArrayList<String>(other.variable_names);
-      this.variable_names = __this__variable_names;
-    }
-  }
-
-  public CqlPreparedResult deepCopy() {
-    return new CqlPreparedResult(this);
-  }
-
-  @Override
-  public void clear() {
-    setItemIdIsSet(false);
-    this.itemId = 0;
-    setCountIsSet(false);
-    this.count = 0;
-    this.variable_types = null;
-    this.variable_names = null;
-  }
-
-  public int getItemId() {
-    return this.itemId;
-  }
-
-  public CqlPreparedResult setItemId(int itemId) {
-    this.itemId = itemId;
-    setItemIdIsSet(true);
-    return this;
-  }
-
-  public void unsetItemId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ITEMID_ISSET_ID);
-  }
-
-  /** Returns true if field itemId is set (has been assigned a value) and false otherwise */
-  public boolean isSetItemId() {
-    return EncodingUtils.testBit(__isset_bitfield, __ITEMID_ISSET_ID);
-  }
-
-  public void setItemIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ITEMID_ISSET_ID, value);
-  }
-
-  public int getCount() {
-    return this.count;
-  }
-
-  public CqlPreparedResult setCount(int count) {
-    this.count = count;
-    setCountIsSet(true);
-    return this;
-  }
-
-  public void unsetCount() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __COUNT_ISSET_ID);
-  }
-
-  /** Returns true if field count is set (has been assigned a value) and false otherwise */
-  public boolean isSetCount() {
-    return EncodingUtils.testBit(__isset_bitfield, __COUNT_ISSET_ID);
-  }
-
-  public void setCountIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __COUNT_ISSET_ID, value);
-  }
-
-  public int getVariable_typesSize() {
-    return (this.variable_types == null) ? 0 : this.variable_types.size();
-  }
-
-  public java.util.Iterator<String> getVariable_typesIterator() {
-    return (this.variable_types == null) ? null : this.variable_types.iterator();
-  }
-
-  public void addToVariable_types(String elem) {
-    if (this.variable_types == null) {
-      this.variable_types = new ArrayList<String>();
-    }
-    this.variable_types.add(elem);
-  }
-
-  public List<String> getVariable_types() {
-    return this.variable_types;
-  }
-
-  public CqlPreparedResult setVariable_types(List<String> variable_types) {
-    this.variable_types = variable_types;
-    return this;
-  }
-
-  public void unsetVariable_types() {
-    this.variable_types = null;
-  }
-
-  /** Returns true if field variable_types is set (has been assigned a value) and false otherwise */
-  public boolean isSetVariable_types() {
-    return this.variable_types != null;
-  }
-
-  public void setVariable_typesIsSet(boolean value) {
-    if (!value) {
-      this.variable_types = null;
-    }
-  }
-
-  public int getVariable_namesSize() {
-    return (this.variable_names == null) ? 0 : this.variable_names.size();
-  }
-
-  public java.util.Iterator<String> getVariable_namesIterator() {
-    return (this.variable_names == null) ? null : this.variable_names.iterator();
-  }
-
-  public void addToVariable_names(String elem) {
-    if (this.variable_names == null) {
-      this.variable_names = new ArrayList<String>();
-    }
-    this.variable_names.add(elem);
-  }
-
-  public List<String> getVariable_names() {
-    return this.variable_names;
-  }
-
-  public CqlPreparedResult setVariable_names(List<String> variable_names) {
-    this.variable_names = variable_names;
-    return this;
-  }
-
-  public void unsetVariable_names() {
-    this.variable_names = null;
-  }
-
-  /** Returns true if field variable_names is set (has been assigned a value) and false otherwise */
-  public boolean isSetVariable_names() {
-    return this.variable_names != null;
-  }
-
-  public void setVariable_namesIsSet(boolean value) {
-    if (!value) {
-      this.variable_names = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case ITEM_ID:
-      if (value == null) {
-        unsetItemId();
-      } else {
-        setItemId((Integer)value);
-      }
-      break;
-
-    case COUNT:
-      if (value == null) {
-        unsetCount();
-      } else {
-        setCount((Integer)value);
-      }
-      break;
-
-    case VARIABLE_TYPES:
-      if (value == null) {
-        unsetVariable_types();
-      } else {
-        setVariable_types((List<String>)value);
-      }
-      break;
-
-    case VARIABLE_NAMES:
-      if (value == null) {
-        unsetVariable_names();
-      } else {
-        setVariable_names((List<String>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case ITEM_ID:
-      return Integer.valueOf(getItemId());
-
-    case COUNT:
-      return Integer.valueOf(getCount());
-
-    case VARIABLE_TYPES:
-      return getVariable_types();
-
-    case VARIABLE_NAMES:
-      return getVariable_names();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** 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();
-    }
-
-    switch (field) {
-    case ITEM_ID:
-      return isSetItemId();
-    case COUNT:
-      return isSetCount();
-    case VARIABLE_TYPES:
-      return isSetVariable_types();
-    case VARIABLE_NAMES:
-      return isSetVariable_names();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof CqlPreparedResult)
-      return this.equals((CqlPreparedResult)that);
-    return false;
-  }
-
-  public boolean equals(CqlPreparedResult that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_itemId = true;
-    boolean that_present_itemId = true;
-    if (this_present_itemId || that_present_itemId) {
-      if (!(this_present_itemId && that_present_itemId))
-        return false;
-      if (this.itemId != that.itemId)
-        return false;
-    }
-
-    boolean this_present_count = true;
-    boolean that_present_count = true;
-    if (this_present_count || that_present_count) {
-      if (!(this_present_count && that_present_count))
-        return false;
-      if (this.count != that.count)
-        return false;
-    }
-
-    boolean this_present_variable_types = true && this.isSetVariable_types();
-    boolean that_present_variable_types = true && that.isSetVariable_types();
-    if (this_present_variable_types || that_present_variable_types) {
-      if (!(this_present_variable_types && that_present_variable_types))
-        return false;
-      if (!this.variable_types.equals(that.variable_types))
-        return false;
-    }
-
-    boolean this_present_variable_names = true && this.isSetVariable_names();
-    boolean that_present_variable_names = true && that.isSetVariable_names();
-    if (this_present_variable_names || that_present_variable_names) {
-      if (!(this_present_variable_names && that_present_variable_names))
-        return false;
-      if (!this.variable_names.equals(that.variable_names))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
-
-    boolean present_itemId = true;
-    builder.append(present_itemId);
-    if (present_itemId)
-      builder.append(itemId);
-
-    boolean present_count = true;
-    builder.append(present_count);
-    if (present_count)
-      builder.append(count);
-
-    boolean present_variable_types = true && (isSetVariable_types());
-    builder.append(present_variable_types);
-    if (present_variable_types)
-      builder.append(variable_types);
-
-    boolean present_variable_names = true && (isSetVariable_names());
-    builder.append(present_variable_names);
-    if (present_variable_names)
-      builder.append(variable_names);
-
-    return builder.toHashCode();
-  }
-
-  @Override
-  public int compareTo(CqlPreparedResult other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetItemId()).compareTo(other.isSetItemId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetItemId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.itemId, other.itemId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetCount()).compareTo(other.isSetCount());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetCount()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, other.count);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetVariable_types()).compareTo(other.isSetVariable_types());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetVariable_types()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.variable_types, other.variable_types);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetVariable_names()).compareTo(other.isSetVariable_names());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetVariable_names()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.variable_names, other.variable_names);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("CqlPreparedResult(");
-    boolean first = true;
-
-    sb.append("itemId:");
-    sb.append(this.itemId);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("count:");
-    sb.append(this.count);
-    first = false;
-    if (isSetVariable_types()) {
-      if (!first) sb.append(", ");
-      sb.append("variable_types:");
-      if (this.variable_types == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.variable_types);
-      }
-      first = false;
-    }
-    if (isSetVariable_names()) {
-      if (!first) sb.append(", ");
-      sb.append("variable_names:");
-      if (this.variable_names == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.variable_names);
-      }
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    // alas, we cannot check 'itemId' 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.
-    // check for sub-struct validity
-  }
-
-  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_bitfield = 0;
-      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);
-    }
-  }
-
-  private static class CqlPreparedResultStandardSchemeFactory implements SchemeFactory {
-    public CqlPreparedResultStandardScheme getScheme() {
-      return new CqlPreparedResultStandardScheme();
-    }
-  }
-
-  private static class CqlPreparedResultStandardScheme extends StandardScheme<CqlPreparedResult> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, CqlPreparedResult struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // ITEM_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.itemId = iprot.readI32();
-              struct.setItemIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // COUNT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.count = iprot.readI32();
-              struct.setCountIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // VARIABLE_TYPES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list200 = iprot.readListBegin();
-                struct.variable_types = new ArrayList<String>(_list200.size);
-                for (int _i201 = 0; _i201 < _list200.size; ++_i201)
-                {
-                  String _elem202;
-                  _elem202 = iprot.readString();
-                  struct.variable_types.add(_elem202);
-                }
-                iprot.readListEnd();
-              }
-              struct.setVariable_typesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // VARIABLE_NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list203 = iprot.readListBegin();
-                struct.variable_names = new ArrayList<String>(_list203.size);
-                for (int _i204 = 0; _i204 < _list203.size; ++_i204)
-                {
-                  String _elem205;
-                  _elem205 = iprot.readString();
-                  struct.variable_names.add(_elem205);
-                }
-                iprot.readListEnd();
-              }
-              struct.setVariable_namesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-
-      // check for required fields of primitive type, which can't be checked in the validate method
-      if (!struct.isSetItemId()) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required field 'itemId' was not found in serialized data! Struct: " + toString());
-      }
-      if (!struct.isSetCount()) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required field 'count' was not found in serialized data! Struct: " + toString());
-      }
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, CqlPreparedResult struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      oprot.writeFieldBegin(ITEM_ID_FIELD_DESC);
-      oprot.writeI32(struct.itemId);
-      oprot.writeFieldEnd();
-      oprot.writeFieldBegin(COUNT_FIELD_DESC);
-      oprot.writeI32(struct.count);
-      oprot.writeFieldEnd();
-      if (struct.variable_types != null) {
-        if (struct.isSetVariable_types()) {
-          oprot.writeFieldBegin(VARIABLE_TYPES_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.variable_types.size()));
-            for (String _iter206 : struct.variable_types)
-            {
-              oprot.writeString(_iter206);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.variable_names != null) {
-        if (struct.isSetVariable_names()) {
-          oprot.writeFieldBegin(VARIABLE_NAMES_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.variable_names.size()));
-            for (String _iter207 : struct.variable_names)
-            {
-              oprot.writeString(_iter207);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class CqlPreparedResultTupleSchemeFactory implements SchemeFactory {
-    public CqlPreparedResultTupleScheme getScheme() {
-      return new CqlPreparedResultTupleScheme();
-    }
-  }
-
-  private static class CqlPreparedResultTupleScheme extends TupleScheme<CqlPreparedResult> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, CqlPreparedResult struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeI32(struct.itemId);
-      oprot.writeI32(struct.count);
-      BitSet optionals = new BitSet();
-      if (struct.isSetVariable_types()) {
-        optionals.set(0);
-      }
-      if (struct.isSetVariable_names()) {
-        optionals.set(1);
-      }
-      oprot.writeBitSet(optionals, 2);
-      if (struct.isSetVariable_types()) {
-        {
-          oprot.writeI32(struct.variable_types.size());
-          for (String _iter208 : struct.variable_types)
-          {
-            oprot.writeString(_iter208);
-          }
-        }
-      }
-      if (struct.isSetVariable_names()) {
-        {
-          oprot.writeI32(struct.variable_names.size());
-          for (String _iter209 : struct.variable_names)
-          {
-            oprot.writeString(_iter209);
-          }
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, CqlPreparedResult struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.itemId = iprot.readI32();
-      struct.setItemIdIsSet(true);
-      struct.count = iprot.readI32();
-      struct.setCountIsSet(true);
-      BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list210 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.variable_types = new ArrayList<String>(_list210.size);
-          for (int _i211 = 0; _i211 < _list210.size; ++_i211)
-          {
-            String _elem212;
-            _elem212 = iprot.readString();
-            struct.variable_types.add(_elem212);
-          }
-        }
-        struct.setVariable_typesIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TList _list213 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.variable_names = new ArrayList<String>(_list213.size);
-          for (int _i214 = 0; _i214 < _list213.size; ++_i214)
-          {
-            String _elem215;
-            _elem215 = iprot.readString();
-            struct.variable_names.add(_elem215);
-          }
-        }
-        struct.setVariable_namesIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
deleted file mode 100644
index 1cdbe07..0000000
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
+++ /dev/null
@@ -1,807 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.cassandra.thrift;
-/*
- * 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- */
-
-
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CqlResult implements org.apache.thrift.TBase<CqlResult, CqlResult._Fields>, java.io.Serializable, Cloneable, Comparable<CqlResult> {
-  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);
-  private static final org.apache.thrift.protocol.TField SCHEMA_FIELD_DESC = new org.apache.thrift.protocol.TField("schema", org.apache.thrift.protocol.TType.STRUCT, (short)4);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new CqlResultStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new CqlResultTupleSchemeFactory());
-  }
-
-  /**
-   * 
-   * @see CqlResultType
-   */
-  public CqlResultType type; // required
-  public List<CqlRow> rows; // optional
-  public int num; // optional
-  public CqlMetadata schema; // optional
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    /**
-     * 
-     * @see CqlResultType
-     */
-    TYPE((short)1, "type"),
-    ROWS((short)2, "rows"),
-    NUM((short)3, "num"),
-    SCHEMA((short)4, "schema");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // TYPE
-          return TYPE;
-        case 2: // ROWS
-          return ROWS;
-        case 3: // NUM
-          return NUM;
-        case 4: // SCHEMA
-          return SCHEMA;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final int __NUM_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.ROWS,_Fields.NUM,_Fields.SCHEMA};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    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)));
-    tmpMap.put(_Fields.SCHEMA, new org.apache.thrift.meta_data.FieldMetaData("schema", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, CqlMetadata.class)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CqlResult.class, metaDataMap);
-  }
-
-  public CqlResult() {
-  }
-
-  public CqlResult(
-    CqlResultType type)
-  {
-    this();
-    this.type = type;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public CqlResult(CqlResult other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetType()) {
-      this.type = other.type;
-    }
-    if (other.isSetRows()) {
-      List<CqlRow> __this__rows = new ArrayList<CqlRow>(other.rows.size());
-      for (CqlRow other_element : other.rows) {
-        __this__rows.add(new CqlRow(other_element));
-      }
-      this.rows = __this__rows;
-    }
-    this.num = other.num;
-    if (other.isSetSchema()) {
-      this.schema = new CqlMetadata(other.schema);
-    }
-  }
-
-  public CqlResult deepCopy() {
-    return new CqlResult(this);
-  }
-
-  @Override
-  public void clear() {
-    this.type = null;
-    this.rows = null;
-    setNumIsSet(false);
-    this.num = 0;
-    this.schema = null;
-  }
-
-  /**
-   * 
-   * @see CqlResultType
-   */
-  public CqlResultType getType() {
-    return this.type;
-  }
-
-  /**
-   * 
-   * @see CqlResultType
-   */
-  public CqlResult setType(CqlResultType type) {
-    this.type = type;
-    return this;
-  }
-
-  public void unsetType() {
-    this.type = null;
-  }
-
-  /** Returns true if field type is set (has been assigned a value) and false otherwise */
-  public boolean isSetType() {
-    return this.type != null;
-  }
-
-  public void setTypeIsSet(boolean value) {
-    if (!value) {
-      this.type = null;
-    }
-  }
-
-  public int getRowsSize() {
-    return (this.rows == null) ? 0 : this.rows.size();
-  }
-
-  public java.util.Iterator<CqlRow> getRowsIterator() {
-    return (this.rows == null) ? null : this.rows.iterator();
-  }
-
-  public void addToRows(CqlRow elem) {
-    if (this.rows == null) {
-      this.rows = new ArrayList<CqlRow>();
-    }
-    this.rows.add(elem);
-  }
-
-  public List<CqlRow> getRows() {
-    return this.rows;
-  }
-
-  public CqlResult setRows(List<CqlRow> rows) {
-    this.rows = rows;
-    return this;
-  }
-
-  public void unsetRows() {
-    this.rows = null;
-  }
-
-  /** Returns true if field rows is set (has been assigned a value) and false otherwise */
-  public boolean isSetRows() {
-    return this.rows != null;
-  }
-
-  public void setRowsIsSet(boolean value) {
-    if (!value) {
-      this.rows = null;
-    }
-  }
-
-  public int getNum() {
-    return this.num;
-  }
-
-  public CqlResult setNum(int num) {
-    this.num = num;
-    setNumIsSet(true);
-    return this;
-  }
-
-  public void unsetNum() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM_ISSET_ID);
-  }
-
-  /** Returns true if field num is set (has been assigned a value) and false otherwise */
-  public boolean isSetNum() {
-    return EncodingUtils.testBit(__isset_bitfield, __NUM_ISSET_ID);
-  }
-
-  public void setNumIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM_ISSET_ID, value);
-  }
-
-  public CqlMetadata getSchema() {
-    return this.schema;
-  }
-
-  public CqlResult setSchema(CqlMetadata schema) {
-    this.schema = schema;
-    return this;
-  }
-
-  public void unsetSchema() {
-    this.schema = null;
-  }
-
-  /** Returns true if field schema is set (has been assigned a value) and false otherwise */
-  public boolean isSetSchema() {
-    return this.schema != null;
-  }
-
-  public void setSchemaIsSet(boolean value) {
-    if (!value) {
-      this.schema = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case TYPE:
-      if (value == null) {
-        unsetType();
-      } else {
-        setType((CqlResultType)value);
-      }
-      break;
-
-    case ROWS:
-      if (value == null) {
-        unsetRows();
-      } else {
-        setRows((List<CqlRow>)value);
-      }
-      break;
-
-    case NUM:
-      if (value == null) {
-        unsetNum();
-      } else {
-        setNum((Integer)value);
-      }
-      break;
-
-    case SCHEMA:
-      if (value == null) {
-        unsetSchema();
-      } else {
-        setSchema((CqlMetadata)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case TYPE:
-      return getType();
-
-    case ROWS:
-      return getRows();
-
-    case NUM:
-      return Integer.valueOf(getNum());
-
-    case SCHEMA:
-      return getSchema();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** 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();
-    }
-
-    switch (field) {
-    case TYPE:
-      return isSetType();
-    case ROWS:
-      return isSetRows();
-    case NUM:
-      return isSetNum();
-    case SCHEMA:
-      return isSetSchema();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof CqlResult)
-      return this.equals((CqlResult)that);
-    return false;
-  }
-
-  public boolean equals(CqlResult that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_type = true && this.isSetType();
-    boolean that_present_type = true && that.isSetType();
-    if (this_present_type || that_present_type) {
-      if (!(this_present_type && that_present_type))
-        return false;
-      if (!this.type.equals(that.type))
-        return false;
-    }
-
-    boolean this_present_rows = true && this.isSetRows();
-    boolean that_present_rows = true && that.isSetRows();
-    if (this_present_rows || that_present_rows) {
-      if (!(this_present_rows && that_present_rows))
-        return false;
-      if (!this.rows.equals(that.rows))
-        return false;
-    }
-
-    boolean this_present_num = true && this.isSetNum();
-    boolean that_present_num = true && that.isSetNum();
-    if (this_present_num || that_present_num) {
-      if (!(this_present_num && that_present_num))
-        return false;
-      if (this.num != that.num)
-        return false;
-    }
-
-    boolean this_present_schema = true && this.isSetSchema();
-    boolean that_present_schema = true && that.isSetSchema();
-    if (this_present_schema || that_present_schema) {
-      if (!(this_present_schema && that_present_schema))
-        return false;
-      if (!this.schema.equals(that.schema))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
-
-    boolean present_type = true && (isSetType());
-    builder.append(present_type);
-    if (present_type)
-      builder.append(type.getValue());
-
-    boolean present_rows = true && (isSetRows());
-    builder.append(present_rows);
-    if (present_rows)
-      builder.append(rows);
-
-    boolean present_num = true && (isSetNum());
-    builder.append(present_num);
-    if (present_num)
-      builder.append(num);
-
-    boolean present_schema = true && (isSetSchema());
-    builder.append(present_schema);
-    if (present_schema)
-      builder.append(schema);
-
-    return builder.toHashCode();
-  }
-
-  @Override
-  public int compareTo(CqlResult other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, other.type);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetRows()).compareTo(other.isSetRows());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetRows()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rows, other.rows);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetNum()).compareTo(other.isSetNum());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetNum()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num, other.num);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetSchema()).compareTo(other.isSetSchema());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetSchema()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.schema, other.schema);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("CqlResult(");
-    boolean first = true;
-
-    sb.append("type:");
-    if (this.type == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.type);
-    }
-    first = false;
-    if (isSetRows()) {
-      if (!first) sb.append(", ");
-      sb.append("rows:");
-      if (this.rows == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.rows);
-      }
-      first = false;
-    }
-    if (isSetNum()) {
-      if (!first) sb.append(", ");
-      sb.append("num:");
-      sb.append(this.num);
-      first = false;
-    }
-    if (isSetSchema()) {
-      if (!first) sb.append(", ");
-      sb.append("schema:");
-      if (this.schema == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.schema);
-      }
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (type == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'type' was not present! Struct: " + toString());
-    }
-    // check for sub-struct validity
-    if (schema != null) {
-      schema.validate();
-    }
-  }
-
-  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_bitfield = 0;
-      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);
-    }
-  }
-
-  private static class CqlResultStandardSchemeFactory implements SchemeFactory {
-    public CqlResultStandardScheme getScheme() {
-      return new CqlResultStandardScheme();
-    }
-  }
-
-  private static class CqlResultStandardScheme extends StandardScheme<CqlResult> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, CqlResult struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.type = CqlResultType.findByValue(iprot.readI32());
-              struct.setTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // ROWS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list192 = iprot.readListBegin();
-                struct.rows = new ArrayList<CqlRow>(_list192.size);
-                for (int _i193 = 0; _i193 < _list192.size; ++_i193)
-                {
-                  CqlRow _elem194;
-                  _elem194 = new CqlRow();
-                  _elem194.read(iprot);
-                  struct.rows.add(_elem194);
-                }
-                iprot.readListEnd();
-              }
-              struct.setRowsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // NUM
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.num = iprot.readI32();
-              struct.setNumIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // SCHEMA
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.schema = new CqlMetadata();
-              struct.schema.read(iprot);
-              struct.setSchemaIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-
-      // check for required fields of primitive type, which can't be checked in the validate method
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, CqlResult struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.type != null) {
-        oprot.writeFieldBegin(TYPE_FIELD_DESC);
-        oprot.writeI32(struct.type.getValue());
-        oprot.writeFieldEnd();
-      }
-      if (struct.rows != null) {
-        if (struct.isSetRows()) {
-          oprot.writeFieldBegin(ROWS_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.rows.size()));
-            for (CqlRow _iter195 : struct.rows)
-            {
-              _iter195.write(oprot);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.isSetNum()) {
-        oprot.writeFieldBegin(NUM_FIELD_DESC);
-        oprot.writeI32(struct.num);
-        oprot.writeFieldEnd();
-      }
-      if (struct.schema != null) {
-        if (struct.isSetSchema()) {
-          oprot.writeFieldBegin(SCHEMA_FIELD_DESC);
-          struct.schema.write(oprot);
-          oprot.writeFieldEnd();
-        }
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class CqlResultTupleSchemeFactory implements SchemeFactory {
-    public CqlResultTupleScheme getScheme() {
-      return new CqlResultTupleScheme();
-    }
-  }
-
-  private static class CqlResultTupleScheme extends TupleScheme<CqlResult> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, CqlResult struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeI32(struct.type.getValue());
-      BitSet optionals = new BitSet();
-      if (struct.isSetRows()) {
-        optionals.set(0);
-      }
-      if (struct.isSetNum()) {
-        optionals.set(1);
-      }
-      if (struct.isSetSchema()) {
-        optionals.set(2);
-      }
-      oprot.writeBitSet(optionals, 3);
-      if (struct.isSetRows()) {
-        {
-          oprot.writeI32(struct.rows.size());
-          for (CqlRow _iter196 : struct.rows)
-          {
-            _iter196.write(oprot);
-          }
-        }
-      }
-      if (struct.isSetNum()) {
-        oprot.writeI32(struct.num);
-      }
-      if (struct.isSetSchema()) {
-        struct.schema.write(oprot);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, CqlResult struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.type = CqlResultType.findByValue(iprot.readI32());
-      struct.setTypeIsSet(true);
-      BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list197 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.rows = new ArrayList<CqlRow>(_list197.size);
-          for (int _i198 = 0; _i198 < _list197.size; ++_i198)
-          {
-            CqlRow _elem199;
-            _elem199 = new CqlRow();
-            _elem199.read(iprot);
-            struct.rows.add(_elem199);
-          }
-        }
-        struct.setRowsIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.num = iprot.readI32();
-        struct.setNumIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.schema = new CqlMetadata();
-        struct.schema.read(iprot);
-        struct.setSchemaIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java
deleted file mode 100644
index 2928f68..0000000
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.cassandra.thrift;
-/*
- * 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- */
-
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-public enum CqlResultType implements org.apache.thrift.TEnum {
-  ROWS(1),
-  VOID(2),
-  INT(3);
-
-  private final int value;
-
-  private CqlResultType(int value) {
-    this.value = value;
-  }
-
-  /**
-   * Get the integer value of this enum value, as defined in the Thrift IDL.
-   */
-  public int getValue() {
-    return value;
-  }
-
-  /**
-   * Find a the enum type by its integer value, as defined in the Thrift IDL.
-   * @return null if the value is not found.
-   */
-  public static CqlResultType findByValue(int value) { 
-    switch (value) {
-      case 1:
-        return ROWS;
-      case 2:
-        return VOID;
-      case 3:
-        return INT;
-      default:
-        return null;
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
deleted file mode 100644
index 7487ed7..0000000
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
+++ /dev/null
@@ -1,584 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.cassandra.thrift;
-/*
- * 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- */
-
-
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Row returned from a CQL query.
- * 
- * This struct is used for both CQL2 and CQL3 queries.  For CQL2, the partition key
- * is special-cased and is always returned.  For CQL3, it is not special cased;
- * it will be included in the columns list if it was included in the SELECT and
- * the key field is always null.
- */
-public class CqlRow implements org.apache.thrift.TBase<CqlRow, CqlRow._Fields>, java.io.Serializable, Cloneable, Comparable<CqlRow> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CqlRow");
-
-  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);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new CqlRowStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new CqlRowTupleSchemeFactory());
-  }
-
-  public ByteBuffer key; // required
-  public List<Column> columns; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    KEY((short)1, "key"),
-    COLUMNS((short)2, "columns");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // KEY
-          return KEY;
-        case 2: // COLUMNS
-          return COLUMNS;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    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);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CqlRow.class, metaDataMap);
-  }
-
-  public CqlRow() {
-  }
-
-  public CqlRow(
-    ByteBuffer key,
-    List<Column> columns)
-  {
-    this();
-    this.key = key;
-    this.columns = columns;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public CqlRow(CqlRow other) {
-    if (other.isSetKey()) {
-      this.key = org.apache.thrift.TBaseHelper.copyBinary(other.key);
-;
-    }
-    if (other.isSetColumns()) {
-      List<Column> __this__columns = new ArrayList<Column>(other.columns.size());
-      for (Column other_element : other.columns) {
-        __this__columns.add(new Column(other_element));
-      }
-      this.columns = __this__columns;
-    }
-  }
-
-  public CqlRow deepCopy() {
-    return new CqlRow(this);
-  }
-
-  @Override
-  public void clear() {
-    this.key = null;
-    this.columns = null;
-  }
-
-  public byte[] getKey() {
-    setKey(org.apache.thrift.TBaseHelper.rightSize(key));
-    return key == null ? null : key.array();
-  }
-
-  public ByteBuffer bufferForKey() {
-    return key;
-  }
-
-  public CqlRow setKey(byte[] key) {
-    setKey(key == null ? (ByteBuffer)null : ByteBuffer.wrap(key));
-    return this;
-  }
-
-  public CqlRow setKey(ByteBuffer key) {
-    this.key = key;
-    return this;
-  }
-
-  public void unsetKey() {
-    this.key = null;
-  }
-
-  /** Returns true if field key is set (has been assigned a value) and false otherwise */
-  public boolean isSetKey() {
-    return this.key != null;
-  }
-
-  public void setKeyIsSet(boolean value) {
-    if (!value) {
-      this.key = null;
-    }
-  }
-
-  public int getColumnsSize() {
-    return (this.columns == null) ? 0 : this.columns.size();
-  }
-
-  public java.util.Iterator<Column> getColumnsIterator() {
-    return (this.columns == null) ? null : this.columns.iterator();
-  }
-
-  public void addToColumns(Column elem) {
-    if (this.columns == null) {
-      this.columns = new ArrayList<Column>();
-    }
-    this.columns.add(elem);
-  }
-
-  public List<Column> getColumns() {
-    return this.columns;
-  }
-
-  public CqlRow setColumns(List<Column> columns) {
-    this.columns = columns;
-    return this;
-  }
-
-  public void unsetColumns() {
-    this.columns = null;
-  }
-
-  /** Returns true if field columns is set (has been assigned a value) and false otherwise */
-  public boolean isSetColumns() {
-    return this.columns != null;
-  }
-
-  public void setColumnsIsSet(boolean value) {
-    if (!value) {
-      this.columns = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case KEY:
-      if (value == null) {
-        unsetKey();
-      } else {
-        setKey((ByteBuffer)value);
-      }
-      break;
-
-    case COLUMNS:
-      if (value == null) {
-        unsetColumns();
-      } else {
-        setColumns((List<Column>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case KEY:
-      return getKey();
-
-    case COLUMNS:
-      return getColumns();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** 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();
-    }
-
-    switch (field) {
-    case KEY:
-      return isSetKey();
-    case COLUMNS:
-      return isSetColumns();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof CqlRow)
-      return this.equals((CqlRow)that);
-    return false;
-  }
-
-  public boolean equals(CqlRow that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_key = true && this.isSetKey();
-    boolean that_present_key = true && that.isSetKey();
-    if (this_present_key || that_present_key) {
-      if (!(this_present_key && that_present_key))
-        return false;
-      if (!this.key.equals(that.key))
-        return false;
-    }
-
-    boolean this_present_columns = true && this.isSetColumns();
-    boolean that_present_columns = true && that.isSetColumns();
-    if (this_present_columns || that_present_columns) {
-      if (!(this_present_columns && that_present_columns))
-        return false;
-      if (!this.columns.equals(that.columns))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
-
-    boolean present_key = true && (isSetKey());
-    builder.append(present_key);
-    if (present_key)
-      builder.append(key);
-
-    boolean present_columns = true && (isSetColumns());
-    builder.append(present_columns);
-    if (present_columns)
-      builder.append(columns);
-
-    return builder.toHashCode();
-  }
-
-  @Override
-  public int compareTo(CqlRow other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetKey()).compareTo(other.isSetKey());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetKey()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, other.key);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetColumns()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("CqlRow(");
-    boolean first = true;
-
-    sb.append("key:");
-    if (this.key == null) {
-      sb.append("null");
-    } else {
-      org.apache.thrift.TBaseHelper.toString(this.key, sb);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("columns:");
-    if (this.columns == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.columns);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (key == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'key' was not present! Struct: " + toString());
-    }
-    if (columns == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'columns' was not present! Struct: " + toString());
-    }
-    // check for sub-struct validity
-  }
-
-  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);
-    }
-  }
-
-  private static class CqlRowStandardSchemeFactory implements SchemeFactory {
-    public CqlRowStandardScheme getScheme() {
-      return new CqlRowStandardScheme();
-    }
-  }
-
-  private static class CqlRowStandardScheme extends StandardScheme<CqlRow> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, CqlRow struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // KEY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.key = iprot.readBinary();
-              struct.setKeyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // COLUMNS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list164 = iprot.readListBegin();
-                struct.columns = new ArrayList<Column>(_list164.size);
-                for (int _i165 = 0; _i165 < _list164.size; ++_i165)
-                {
-                  Column _elem166;
-                  _elem166 = new Column();
-                  _elem166.read(iprot);
-                  struct.columns.add(_elem166);
-                }
-                iprot.readListEnd();
-              }
-              struct.setColumnsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-
-      // check for required fields of primitive type, which can't be checked in the validate method
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, CqlRow struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.key != null) {
-        oprot.writeFieldBegin(KEY_FIELD_DESC);
-        oprot.writeBinary(struct.key);
-        oprot.writeFieldEnd();
-      }
-      if (struct.columns != null) {
-        oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
-        {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.columns.size()));
-          for (Column _iter167 : struct.columns)
-          {
-            _iter167.write(oprot);
-          }
-          oprot.writeListEnd();
-        }
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class CqlRowTupleSchemeFactory implements SchemeFactory {
-    public CqlRowTupleScheme getScheme() {
-      return new CqlRowTupleScheme();
-    }
-  }
-
-  private static class CqlRowTupleScheme extends TupleScheme<CqlRow> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, CqlRow struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeBinary(struct.key);
-      {
-        oprot.writeI32(struct.columns.size());
-        for (Column _iter168 : struct.columns)
-        {
-          _iter168.write(oprot);
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, CqlRow struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.key = iprot.readBinary();
-      struct.setKeyIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list169 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-        struct.columns = new ArrayList<Column>(_list169.size);
-        for (int _i170 = 0; _i170 < _list169.size; ++_i170)
-        {
-          Column _elem171;
-          _elem171 = new Column();
-          _elem171.read(iprot);
-          struct.columns.add(_elem171);
-        }
-      }
-      struct.setColumnsIsSet(true);
-    }
-  }
-
-}
-


Mime
View raw message