You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/12/13 09:27:44 UTC

[20/26] cassandra git commit: Thrift removal

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java
deleted file mode 100644
index 261d93f..0000000
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java
+++ /dev/null
@@ -1,758 +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 java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-
-/**
- * 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
- * instances of ColumnOrSuperColumn will have the requested SuperColumn in the attribute super_column. For queries resulting
- * in Columns, those values will be in the attribute column. This change was made between 0.3 and 0.4 to standardize on
- * single query methods that may return either a SuperColumn or Column.
- * 
- * If the query was on a counter column family, you will either get a counter_column (instead of a column) or a
- * counter_super_column (instead of a super_column)
- * 
- * @param column. The Column returned by get() or get_slice().
- * @param super_column. The SuperColumn returned by get() or get_slice().
- * @param counter_column. The Counterolumn returned by get() or get_slice().
- * @param counter_super_column. The CounterSuperColumn returned by get() or get_slice().
- */
-public class ColumnOrSuperColumn implements org.apache.thrift.TBase<ColumnOrSuperColumn, ColumnOrSuperColumn._Fields>, java.io.Serializable, Cloneable, Comparable<ColumnOrSuperColumn> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnOrSuperColumn");
-
-  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);
-  private static final org.apache.thrift.protocol.TField COUNTER_COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("counter_column", org.apache.thrift.protocol.TType.STRUCT, (short)3);
-  private static final org.apache.thrift.protocol.TField COUNTER_SUPER_COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("counter_super_column", org.apache.thrift.protocol.TType.STRUCT, (short)4);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ColumnOrSuperColumnStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ColumnOrSuperColumnTupleSchemeFactory());
-  }
-
-  public Column column; // optional
-  public SuperColumn super_column; // optional
-  public CounterColumn counter_column; // optional
-  public CounterSuperColumn counter_super_column; // 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 {
-    COLUMN((short)1, "column"),
-    SUPER_COLUMN((short)2, "super_column"),
-    COUNTER_COLUMN((short)3, "counter_column"),
-    COUNTER_SUPER_COLUMN((short)4, "counter_super_column");
-
-    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: // COLUMN
-          return COLUMN;
-        case 2: // SUPER_COLUMN
-          return SUPER_COLUMN;
-        case 3: // COUNTER_COLUMN
-          return COUNTER_COLUMN;
-        case 4: // COUNTER_SUPER_COLUMN
-          return COUNTER_SUPER_COLUMN;
-        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 _Fields optionals[] = {_Fields.COLUMN,_Fields.SUPER_COLUMN,_Fields.COUNTER_COLUMN,_Fields.COUNTER_SUPER_COLUMN};
-  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.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)));
-    tmpMap.put(_Fields.COUNTER_COLUMN, new org.apache.thrift.meta_data.FieldMetaData("counter_column", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, CounterColumn.class)));
-    tmpMap.put(_Fields.COUNTER_SUPER_COLUMN, new org.apache.thrift.meta_data.FieldMetaData("counter_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);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ColumnOrSuperColumn.class, metaDataMap);
-  }
-
-  public ColumnOrSuperColumn() {
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public ColumnOrSuperColumn(ColumnOrSuperColumn other) {
-    if (other.isSetColumn()) {
-      this.column = new Column(other.column);
-    }
-    if (other.isSetSuper_column()) {
-      this.super_column = new SuperColumn(other.super_column);
-    }
-    if (other.isSetCounter_column()) {
-      this.counter_column = new CounterColumn(other.counter_column);
-    }
-    if (other.isSetCounter_super_column()) {
-      this.counter_super_column = new CounterSuperColumn(other.counter_super_column);
-    }
-  }
-
-  public ColumnOrSuperColumn deepCopy() {
-    return new ColumnOrSuperColumn(this);
-  }
-
-  @Override
-  public void clear() {
-    this.column = null;
-    this.super_column = null;
-    this.counter_column = null;
-    this.counter_super_column = null;
-  }
-
-  public Column getColumn() {
-    return this.column;
-  }
-
-  public ColumnOrSuperColumn setColumn(Column column) {
-    this.column = column;
-    return this;
-  }
-
-  public void unsetColumn() {
-    this.column = null;
-  }
-
-  /** Returns true if field column is set (has been assigned a value) and false otherwise */
-  public boolean isSetColumn() {
-    return this.column != null;
-  }
-
-  public void setColumnIsSet(boolean value) {
-    if (!value) {
-      this.column = null;
-    }
-  }
-
-  public SuperColumn getSuper_column() {
-    return this.super_column;
-  }
-
-  public ColumnOrSuperColumn setSuper_column(SuperColumn super_column) {
-    this.super_column = super_column;
-    return this;
-  }
-
-  public void unsetSuper_column() {
-    this.super_column = null;
-  }
-
-  /** 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;
-  }
-
-  public void setSuper_columnIsSet(boolean value) {
-    if (!value) {
-      this.super_column = null;
-    }
-  }
-
-  public CounterColumn getCounter_column() {
-    return this.counter_column;
-  }
-
-  public ColumnOrSuperColumn setCounter_column(CounterColumn counter_column) {
-    this.counter_column = counter_column;
-    return this;
-  }
-
-  public void unsetCounter_column() {
-    this.counter_column = null;
-  }
-
-  /** Returns true if field counter_column is set (has been assigned a value) and false otherwise */
-  public boolean isSetCounter_column() {
-    return this.counter_column != null;
-  }
-
-  public void setCounter_columnIsSet(boolean value) {
-    if (!value) {
-      this.counter_column = null;
-    }
-  }
-
-  public CounterSuperColumn getCounter_super_column() {
-    return this.counter_super_column;
-  }
-
-  public ColumnOrSuperColumn setCounter_super_column(CounterSuperColumn counter_super_column) {
-    this.counter_super_column = counter_super_column;
-    return this;
-  }
-
-  public void unsetCounter_super_column() {
-    this.counter_super_column = null;
-  }
-
-  /** Returns true if field counter_super_column is set (has been assigned a value) and false otherwise */
-  public boolean isSetCounter_super_column() {
-    return this.counter_super_column != null;
-  }
-
-  public void setCounter_super_columnIsSet(boolean value) {
-    if (!value) {
-      this.counter_super_column = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case COLUMN:
-      if (value == null) {
-        unsetColumn();
-      } else {
-        setColumn((Column)value);
-      }
-      break;
-
-    case SUPER_COLUMN:
-      if (value == null) {
-        unsetSuper_column();
-      } else {
-        setSuper_column((SuperColumn)value);
-      }
-      break;
-
-    case COUNTER_COLUMN:
-      if (value == null) {
-        unsetCounter_column();
-      } else {
-        setCounter_column((CounterColumn)value);
-      }
-      break;
-
-    case COUNTER_SUPER_COLUMN:
-      if (value == null) {
-        unsetCounter_super_column();
-      } else {
-        setCounter_super_column((CounterSuperColumn)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case COLUMN:
-      return getColumn();
-
-    case SUPER_COLUMN:
-      return getSuper_column();
-
-    case COUNTER_COLUMN:
-      return getCounter_column();
-
-    case COUNTER_SUPER_COLUMN:
-      return getCounter_super_column();
-
-    }
-    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 COLUMN:
-      return isSetColumn();
-    case SUPER_COLUMN:
-      return isSetSuper_column();
-    case COUNTER_COLUMN:
-      return isSetCounter_column();
-    case COUNTER_SUPER_COLUMN:
-      return isSetCounter_super_column();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof ColumnOrSuperColumn)
-      return this.equals((ColumnOrSuperColumn)that);
-    return false;
-  }
-
-  public boolean equals(ColumnOrSuperColumn that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_column = true && this.isSetColumn();
-    boolean that_present_column = true && that.isSetColumn();
-    if (this_present_column || that_present_column) {
-      if (!(this_present_column && that_present_column))
-        return false;
-      if (!this.column.equals(that.column))
-        return false;
-    }
-
-    boolean this_present_super_column = true && this.isSetSuper_column();
-    boolean that_present_super_column = true && that.isSetSuper_column();
-    if (this_present_super_column || that_present_super_column) {
-      if (!(this_present_super_column && that_present_super_column))
-        return false;
-      if (!this.super_column.equals(that.super_column))
-        return false;
-    }
-
-    boolean this_present_counter_column = true && this.isSetCounter_column();
-    boolean that_present_counter_column = true && that.isSetCounter_column();
-    if (this_present_counter_column || that_present_counter_column) {
-      if (!(this_present_counter_column && that_present_counter_column))
-        return false;
-      if (!this.counter_column.equals(that.counter_column))
-        return false;
-    }
-
-    boolean this_present_counter_super_column = true && this.isSetCounter_super_column();
-    boolean that_present_counter_super_column = true && that.isSetCounter_super_column();
-    if (this_present_counter_super_column || that_present_counter_super_column) {
-      if (!(this_present_counter_super_column && that_present_counter_super_column))
-        return false;
-      if (!this.counter_super_column.equals(that.counter_super_column))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
-
-    boolean present_column = true && (isSetColumn());
-    builder.append(present_column);
-    if (present_column)
-      builder.append(column);
-
-    boolean present_super_column = true && (isSetSuper_column());
-    builder.append(present_super_column);
-    if (present_super_column)
-      builder.append(super_column);
-
-    boolean present_counter_column = true && (isSetCounter_column());
-    builder.append(present_counter_column);
-    if (present_counter_column)
-      builder.append(counter_column);
-
-    boolean present_counter_super_column = true && (isSetCounter_super_column());
-    builder.append(present_counter_super_column);
-    if (present_counter_super_column)
-      builder.append(counter_super_column);
-
-    return builder.toHashCode();
-  }
-
-  @Override
-  public int compareTo(ColumnOrSuperColumn other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetColumn()).compareTo(other.isSetColumn());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetColumn()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, other.column);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetSuper_column()).compareTo(other.isSetSuper_column());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetSuper_column()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.super_column, other.super_column);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetCounter_column()).compareTo(other.isSetCounter_column());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetCounter_column()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.counter_column, other.counter_column);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetCounter_super_column()).compareTo(other.isSetCounter_super_column());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetCounter_super_column()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.counter_super_column, other.counter_super_column);
-      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("ColumnOrSuperColumn(");
-    boolean first = true;
-
-    if (isSetColumn()) {
-      sb.append("column:");
-      if (this.column == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.column);
-      }
-      first = false;
-    }
-    if (isSetSuper_column()) {
-      if (!first) sb.append(", ");
-      sb.append("super_column:");
-      if (this.super_column == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.super_column);
-      }
-      first = false;
-    }
-    if (isSetCounter_column()) {
-      if (!first) sb.append(", ");
-      sb.append("counter_column:");
-      if (this.counter_column == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.counter_column);
-      }
-      first = false;
-    }
-    if (isSetCounter_super_column()) {
-      if (!first) sb.append(", ");
-      sb.append("counter_super_column:");
-      if (this.counter_super_column == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.counter_super_column);
-      }
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    // check for sub-struct validity
-    if (column != null) {
-      column.validate();
-    }
-    if (super_column != null) {
-      super_column.validate();
-    }
-    if (counter_column != null) {
-      counter_column.validate();
-    }
-    if (counter_super_column != null) {
-      counter_super_column.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 {
-      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 ColumnOrSuperColumnStandardSchemeFactory implements SchemeFactory {
-    public ColumnOrSuperColumnStandardScheme getScheme() {
-      return new ColumnOrSuperColumnStandardScheme();
-    }
-  }
-
-  private static class ColumnOrSuperColumnStandardScheme extends StandardScheme<ColumnOrSuperColumn> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ColumnOrSuperColumn 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: // COLUMN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.column = new Column();
-              struct.column.read(iprot);
-              struct.setColumnIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // SUPER_COLUMN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.super_column = new SuperColumn();
-              struct.super_column.read(iprot);
-              struct.setSuper_columnIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // COUNTER_COLUMN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.counter_column = new CounterColumn();
-              struct.counter_column.read(iprot);
-              struct.setCounter_columnIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // COUNTER_SUPER_COLUMN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.counter_super_column = new CounterSuperColumn();
-              struct.counter_super_column.read(iprot);
-              struct.setCounter_super_columnIsSet(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, ColumnOrSuperColumn struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.column != null) {
-        if (struct.isSetColumn()) {
-          oprot.writeFieldBegin(COLUMN_FIELD_DESC);
-          struct.column.write(oprot);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.super_column != null) {
-        if (struct.isSetSuper_column()) {
-          oprot.writeFieldBegin(SUPER_COLUMN_FIELD_DESC);
-          struct.super_column.write(oprot);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.counter_column != null) {
-        if (struct.isSetCounter_column()) {
-          oprot.writeFieldBegin(COUNTER_COLUMN_FIELD_DESC);
-          struct.counter_column.write(oprot);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.counter_super_column != null) {
-        if (struct.isSetCounter_super_column()) {
-          oprot.writeFieldBegin(COUNTER_SUPER_COLUMN_FIELD_DESC);
-          struct.counter_super_column.write(oprot);
-          oprot.writeFieldEnd();
-        }
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class ColumnOrSuperColumnTupleSchemeFactory implements SchemeFactory {
-    public ColumnOrSuperColumnTupleScheme getScheme() {
-      return new ColumnOrSuperColumnTupleScheme();
-    }
-  }
-
-  private static class ColumnOrSuperColumnTupleScheme extends TupleScheme<ColumnOrSuperColumn> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ColumnOrSuperColumn struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetColumn()) {
-        optionals.set(0);
-      }
-      if (struct.isSetSuper_column()) {
-        optionals.set(1);
-      }
-      if (struct.isSetCounter_column()) {
-        optionals.set(2);
-      }
-      if (struct.isSetCounter_super_column()) {
-        optionals.set(3);
-      }
-      oprot.writeBitSet(optionals, 4);
-      if (struct.isSetColumn()) {
-        struct.column.write(oprot);
-      }
-      if (struct.isSetSuper_column()) {
-        struct.super_column.write(oprot);
-      }
-      if (struct.isSetCounter_column()) {
-        struct.counter_column.write(oprot);
-      }
-      if (struct.isSetCounter_super_column()) {
-        struct.counter_super_column.write(oprot);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ColumnOrSuperColumn struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.column = new Column();
-        struct.column.read(iprot);
-        struct.setColumnIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.super_column = new SuperColumn();
-        struct.super_column.read(iprot);
-        struct.setSuper_columnIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.counter_column = new CounterColumn();
-        struct.counter_column.read(iprot);
-        struct.setCounter_columnIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.counter_super_column = new CounterSuperColumn();
-        struct.counter_super_column.read(iprot);
-        struct.setCounter_super_columnIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java
deleted file mode 100644
index 73aff66..0000000
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java
+++ /dev/null
@@ -1,538 +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;
-
-/**
- * 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 org.apache.thrift.TBase<ColumnParent, ColumnParent._Fields>, java.io.Serializable, Cloneable, Comparable<ColumnParent> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnParent");
-
-  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 Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ColumnParentStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ColumnParentTupleSchemeFactory());
-  }
-
-  public String column_family; // required
-  public ByteBuffer super_column; // 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 {
-    COLUMN_FAMILY((short)3, "column_family"),
-    SUPER_COLUMN((short)4, "super_column");
-
-    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 3: // COLUMN_FAMILY
-          return COLUMN_FAMILY;
-        case 4: // SUPER_COLUMN
-          return SUPER_COLUMN;
-        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 _Fields optionals[] = {_Fields.SUPER_COLUMN};
-  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.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);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ColumnParent.class, metaDataMap);
-  }
-
-  public ColumnParent() {
-  }
-
-  public ColumnParent(
-    String column_family)
-  {
-    this();
-    this.column_family = column_family;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public ColumnParent(ColumnParent other) {
-    if (other.isSetColumn_family()) {
-      this.column_family = other.column_family;
-    }
-    if (other.isSetSuper_column()) {
-      this.super_column = org.apache.thrift.TBaseHelper.copyBinary(other.super_column);
-;
-    }
-  }
-
-  public ColumnParent deepCopy() {
-    return new ColumnParent(this);
-  }
-
-  @Override
-  public void clear() {
-    this.column_family = null;
-    this.super_column = null;
-  }
-
-  public String getColumn_family() {
-    return this.column_family;
-  }
-
-  public ColumnParent setColumn_family(String column_family) {
-    this.column_family = column_family;
-    return this;
-  }
-
-  public void unsetColumn_family() {
-    this.column_family = null;
-  }
-
-  /** 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;
-  }
-
-  public void setColumn_familyIsSet(boolean value) {
-    if (!value) {
-      this.column_family = null;
-    }
-  }
-
-  public byte[] getSuper_column() {
-    setSuper_column(org.apache.thrift.TBaseHelper.rightSize(super_column));
-    return super_column == null ? null : super_column.array();
-  }
-
-  public ByteBuffer bufferForSuper_column() {
-    return super_column;
-  }
-
-  public ColumnParent setSuper_column(byte[] super_column) {
-    setSuper_column(super_column == null ? (ByteBuffer)null : ByteBuffer.wrap(super_column));
-    return this;
-  }
-
-  public ColumnParent setSuper_column(ByteBuffer super_column) {
-    this.super_column = super_column;
-    return this;
-  }
-
-  public void unsetSuper_column() {
-    this.super_column = null;
-  }
-
-  /** 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;
-  }
-
-  public void setSuper_columnIsSet(boolean value) {
-    if (!value) {
-      this.super_column = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case COLUMN_FAMILY:
-      if (value == null) {
-        unsetColumn_family();
-      } else {
-        setColumn_family((String)value);
-      }
-      break;
-
-    case SUPER_COLUMN:
-      if (value == null) {
-        unsetSuper_column();
-      } else {
-        setSuper_column((ByteBuffer)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case COLUMN_FAMILY:
-      return getColumn_family();
-
-    case SUPER_COLUMN:
-      return getSuper_column();
-
-    }
-    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 COLUMN_FAMILY:
-      return isSetColumn_family();
-    case SUPER_COLUMN:
-      return isSetSuper_column();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof ColumnParent)
-      return this.equals((ColumnParent)that);
-    return false;
-  }
-
-  public boolean equals(ColumnParent that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_column_family = true && this.isSetColumn_family();
-    boolean that_present_column_family = true && that.isSetColumn_family();
-    if (this_present_column_family || that_present_column_family) {
-      if (!(this_present_column_family && that_present_column_family))
-        return false;
-      if (!this.column_family.equals(that.column_family))
-        return false;
-    }
-
-    boolean this_present_super_column = true && this.isSetSuper_column();
-    boolean that_present_super_column = true && that.isSetSuper_column();
-    if (this_present_super_column || that_present_super_column) {
-      if (!(this_present_super_column && that_present_super_column))
-        return false;
-      if (!this.super_column.equals(that.super_column))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
-
-    boolean present_column_family = true && (isSetColumn_family());
-    builder.append(present_column_family);
-    if (present_column_family)
-      builder.append(column_family);
-
-    boolean present_super_column = true && (isSetSuper_column());
-    builder.append(present_super_column);
-    if (present_super_column)
-      builder.append(super_column);
-
-    return builder.toHashCode();
-  }
-
-  @Override
-  public int compareTo(ColumnParent other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetColumn_family()).compareTo(other.isSetColumn_family());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetColumn_family()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_family, other.column_family);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetSuper_column()).compareTo(other.isSetSuper_column());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetSuper_column()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.super_column, other.super_column);
-      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("ColumnParent(");
-    boolean first = true;
-
-    sb.append("column_family:");
-    if (this.column_family == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.column_family);
-    }
-    first = false;
-    if (isSetSuper_column()) {
-      if (!first) sb.append(", ");
-      sb.append("super_column:");
-      if (this.super_column == null) {
-        sb.append("null");
-      } else {
-        org.apache.thrift.TBaseHelper.toString(this.super_column, sb);
-      }
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (column_family == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'column_family' 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 ColumnParentStandardSchemeFactory implements SchemeFactory {
-    public ColumnParentStandardScheme getScheme() {
-      return new ColumnParentStandardScheme();
-    }
-  }
-
-  private static class ColumnParentStandardScheme extends StandardScheme<ColumnParent> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ColumnParent 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 3: // COLUMN_FAMILY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.column_family = iprot.readString();
-              struct.setColumn_familyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // SUPER_COLUMN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.super_column = iprot.readBinary();
-              struct.setSuper_columnIsSet(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, ColumnParent struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.column_family != null) {
-        oprot.writeFieldBegin(COLUMN_FAMILY_FIELD_DESC);
-        oprot.writeString(struct.column_family);
-        oprot.writeFieldEnd();
-      }
-      if (struct.super_column != null) {
-        if (struct.isSetSuper_column()) {
-          oprot.writeFieldBegin(SUPER_COLUMN_FIELD_DESC);
-          oprot.writeBinary(struct.super_column);
-          oprot.writeFieldEnd();
-        }
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class ColumnParentTupleSchemeFactory implements SchemeFactory {
-    public ColumnParentTupleScheme getScheme() {
-      return new ColumnParentTupleScheme();
-    }
-  }
-
-  private static class ColumnParentTupleScheme extends TupleScheme<ColumnParent> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ColumnParent struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.column_family);
-      BitSet optionals = new BitSet();
-      if (struct.isSetSuper_column()) {
-        optionals.set(0);
-      }
-      oprot.writeBitSet(optionals, 1);
-      if (struct.isSetSuper_column()) {
-        oprot.writeBinary(struct.super_column);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ColumnParent struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.column_family = iprot.readString();
-      struct.setColumn_familyIsSet(true);
-      BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.super_column = iprot.readBinary();
-        struct.setSuper_columnIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java
deleted file mode 100644
index 997c1bb..0000000
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java
+++ /dev/null
@@ -1,648 +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 java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-
-/**
- * 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.
- * 
- * ColumnPath is used to looking up a single column.
- * 
- * @param column_family. The name of the CF of the column being looked up.
- * @param super_column. The super column name.
- * @param column. The column name.
- */
-public class ColumnPath implements org.apache.thrift.TBase<ColumnPath, ColumnPath._Fields>, java.io.Serializable, Cloneable, Comparable<ColumnPath> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnPath");
-
-  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);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ColumnPathStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ColumnPathTupleSchemeFactory());
-  }
-
-  public String column_family; // required
-  public ByteBuffer super_column; // optional
-  public ByteBuffer column; // 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 {
-    COLUMN_FAMILY((short)3, "column_family"),
-    SUPER_COLUMN((short)4, "super_column"),
-    COLUMN((short)5, "column");
-
-    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 3: // COLUMN_FAMILY
-          return COLUMN_FAMILY;
-        case 4: // SUPER_COLUMN
-          return SUPER_COLUMN;
-        case 5: // COLUMN
-          return COLUMN;
-        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 _Fields optionals[] = {_Fields.SUPER_COLUMN,_Fields.COLUMN};
-  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.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);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ColumnPath.class, metaDataMap);
-  }
-
-  public ColumnPath() {
-  }
-
-  public ColumnPath(
-    String column_family)
-  {
-    this();
-    this.column_family = column_family;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public ColumnPath(ColumnPath other) {
-    if (other.isSetColumn_family()) {
-      this.column_family = other.column_family;
-    }
-    if (other.isSetSuper_column()) {
-      this.super_column = org.apache.thrift.TBaseHelper.copyBinary(other.super_column);
-;
-    }
-    if (other.isSetColumn()) {
-      this.column = org.apache.thrift.TBaseHelper.copyBinary(other.column);
-;
-    }
-  }
-
-  public ColumnPath deepCopy() {
-    return new ColumnPath(this);
-  }
-
-  @Override
-  public void clear() {
-    this.column_family = null;
-    this.super_column = null;
-    this.column = null;
-  }
-
-  public String getColumn_family() {
-    return this.column_family;
-  }
-
-  public ColumnPath setColumn_family(String column_family) {
-    this.column_family = column_family;
-    return this;
-  }
-
-  public void unsetColumn_family() {
-    this.column_family = null;
-  }
-
-  /** 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;
-  }
-
-  public void setColumn_familyIsSet(boolean value) {
-    if (!value) {
-      this.column_family = null;
-    }
-  }
-
-  public byte[] getSuper_column() {
-    setSuper_column(org.apache.thrift.TBaseHelper.rightSize(super_column));
-    return super_column == null ? null : super_column.array();
-  }
-
-  public ByteBuffer bufferForSuper_column() {
-    return super_column;
-  }
-
-  public ColumnPath setSuper_column(byte[] super_column) {
-    setSuper_column(super_column == null ? (ByteBuffer)null : ByteBuffer.wrap(super_column));
-    return this;
-  }
-
-  public ColumnPath setSuper_column(ByteBuffer super_column) {
-    this.super_column = super_column;
-    return this;
-  }
-
-  public void unsetSuper_column() {
-    this.super_column = null;
-  }
-
-  /** 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;
-  }
-
-  public void setSuper_columnIsSet(boolean value) {
-    if (!value) {
-      this.super_column = null;
-    }
-  }
-
-  public byte[] getColumn() {
-    setColumn(org.apache.thrift.TBaseHelper.rightSize(column));
-    return column == null ? null : column.array();
-  }
-
-  public ByteBuffer bufferForColumn() {
-    return column;
-  }
-
-  public ColumnPath setColumn(byte[] column) {
-    setColumn(column == null ? (ByteBuffer)null : ByteBuffer.wrap(column));
-    return this;
-  }
-
-  public ColumnPath setColumn(ByteBuffer column) {
-    this.column = column;
-    return this;
-  }
-
-  public void unsetColumn() {
-    this.column = null;
-  }
-
-  /** Returns true if field column is set (has been assigned a value) and false otherwise */
-  public boolean isSetColumn() {
-    return this.column != null;
-  }
-
-  public void setColumnIsSet(boolean value) {
-    if (!value) {
-      this.column = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case COLUMN_FAMILY:
-      if (value == null) {
-        unsetColumn_family();
-      } else {
-        setColumn_family((String)value);
-      }
-      break;
-
-    case SUPER_COLUMN:
-      if (value == null) {
-        unsetSuper_column();
-      } else {
-        setSuper_column((ByteBuffer)value);
-      }
-      break;
-
-    case COLUMN:
-      if (value == null) {
-        unsetColumn();
-      } else {
-        setColumn((ByteBuffer)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case COLUMN_FAMILY:
-      return getColumn_family();
-
-    case SUPER_COLUMN:
-      return getSuper_column();
-
-    case COLUMN:
-      return getColumn();
-
-    }
-    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 COLUMN_FAMILY:
-      return isSetColumn_family();
-    case SUPER_COLUMN:
-      return isSetSuper_column();
-    case COLUMN:
-      return isSetColumn();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof ColumnPath)
-      return this.equals((ColumnPath)that);
-    return false;
-  }
-
-  public boolean equals(ColumnPath that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_column_family = true && this.isSetColumn_family();
-    boolean that_present_column_family = true && that.isSetColumn_family();
-    if (this_present_column_family || that_present_column_family) {
-      if (!(this_present_column_family && that_present_column_family))
-        return false;
-      if (!this.column_family.equals(that.column_family))
-        return false;
-    }
-
-    boolean this_present_super_column = true && this.isSetSuper_column();
-    boolean that_present_super_column = true && that.isSetSuper_column();
-    if (this_present_super_column || that_present_super_column) {
-      if (!(this_present_super_column && that_present_super_column))
-        return false;
-      if (!this.super_column.equals(that.super_column))
-        return false;
-    }
-
-    boolean this_present_column = true && this.isSetColumn();
-    boolean that_present_column = true && that.isSetColumn();
-    if (this_present_column || that_present_column) {
-      if (!(this_present_column && that_present_column))
-        return false;
-      if (!this.column.equals(that.column))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
-
-    boolean present_column_family = true && (isSetColumn_family());
-    builder.append(present_column_family);
-    if (present_column_family)
-      builder.append(column_family);
-
-    boolean present_super_column = true && (isSetSuper_column());
-    builder.append(present_super_column);
-    if (present_super_column)
-      builder.append(super_column);
-
-    boolean present_column = true && (isSetColumn());
-    builder.append(present_column);
-    if (present_column)
-      builder.append(column);
-
-    return builder.toHashCode();
-  }
-
-  @Override
-  public int compareTo(ColumnPath other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetColumn_family()).compareTo(other.isSetColumn_family());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetColumn_family()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_family, other.column_family);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetSuper_column()).compareTo(other.isSetSuper_column());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetSuper_column()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.super_column, other.super_column);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetColumn()).compareTo(other.isSetColumn());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetColumn()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, other.column);
-      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("ColumnPath(");
-    boolean first = true;
-
-    sb.append("column_family:");
-    if (this.column_family == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.column_family);
-    }
-    first = false;
-    if (isSetSuper_column()) {
-      if (!first) sb.append(", ");
-      sb.append("super_column:");
-      if (this.super_column == null) {
-        sb.append("null");
-      } else {
-        org.apache.thrift.TBaseHelper.toString(this.super_column, sb);
-      }
-      first = false;
-    }
-    if (isSetColumn()) {
-      if (!first) sb.append(", ");
-      sb.append("column:");
-      if (this.column == null) {
-        sb.append("null");
-      } else {
-        org.apache.thrift.TBaseHelper.toString(this.column, sb);
-      }
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (column_family == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'column_family' 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 ColumnPathStandardSchemeFactory implements SchemeFactory {
-    public ColumnPathStandardScheme getScheme() {
-      return new ColumnPathStandardScheme();
-    }
-  }
-
-  private static class ColumnPathStandardScheme extends StandardScheme<ColumnPath> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ColumnPath 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 3: // COLUMN_FAMILY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.column_family = iprot.readString();
-              struct.setColumn_familyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // SUPER_COLUMN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.super_column = iprot.readBinary();
-              struct.setSuper_columnIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // COLUMN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.column = iprot.readBinary();
-              struct.setColumnIsSet(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, ColumnPath struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.column_family != null) {
-        oprot.writeFieldBegin(COLUMN_FAMILY_FIELD_DESC);
-        oprot.writeString(struct.column_family);
-        oprot.writeFieldEnd();
-      }
-      if (struct.super_column != null) {
-        if (struct.isSetSuper_column()) {
-          oprot.writeFieldBegin(SUPER_COLUMN_FIELD_DESC);
-          oprot.writeBinary(struct.super_column);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.column != null) {
-        if (struct.isSetColumn()) {
-          oprot.writeFieldBegin(COLUMN_FIELD_DESC);
-          oprot.writeBinary(struct.column);
-          oprot.writeFieldEnd();
-        }
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class ColumnPathTupleSchemeFactory implements SchemeFactory {
-    public ColumnPathTupleScheme getScheme() {
-      return new ColumnPathTupleScheme();
-    }
-  }
-
-  private static class ColumnPathTupleScheme extends TupleScheme<ColumnPath> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ColumnPath struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.column_family);
-      BitSet optionals = new BitSet();
-      if (struct.isSetSuper_column()) {
-        optionals.set(0);
-      }
-      if (struct.isSetColumn()) {
-        optionals.set(1);
-      }
-      oprot.writeBitSet(optionals, 2);
-      if (struct.isSetSuper_column()) {
-        oprot.writeBinary(struct.super_column);
-      }
-      if (struct.isSetColumn()) {
-        oprot.writeBinary(struct.column);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ColumnPath struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.column_family = iprot.readString();
-      struct.setColumn_familyIsSet(true);
-      BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.super_column = iprot.readBinary();
-        struct.setSuper_columnIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.column = iprot.readBinary();
-        struct.setColumnIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnSlice.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnSlice.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnSlice.java
deleted file mode 100644
index 67b88a3..0000000
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnSlice.java
+++ /dev/null
@@ -1,551 +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;
-
-/**
- * The ColumnSlice is used to select a set of columns from inside a row.
- * If start or finish are unspecified they will default to the start-of
- * end-of value.
- * @param start. The start of the ColumnSlice inclusive
- * @param finish. The end of the ColumnSlice inclusive
- */
-public class ColumnSlice implements org.apache.thrift.TBase<ColumnSlice, ColumnSlice._Fields>, java.io.Serializable, Cloneable, Comparable<ColumnSlice> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnSlice");
-
-  private static final org.apache.thrift.protocol.TField START_FIELD_DESC = new org.apache.thrift.protocol.TField("start", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField FINISH_FIELD_DESC = new org.apache.thrift.protocol.TField("finish", org.apache.thrift.protocol.TType.STRING, (short)2);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ColumnSliceStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ColumnSliceTupleSchemeFactory());
-  }
-
-  public ByteBuffer start; // optional
-  public ByteBuffer finish; // 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 {
-    START((short)1, "start"),
-    FINISH((short)2, "finish");
-
-    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: // START
-          return START;
-        case 2: // FINISH
-          return FINISH;
-        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 _Fields optionals[] = {_Fields.START,_Fields.FINISH};
-  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.START, new org.apache.thrift.meta_data.FieldMetaData("start", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    tmpMap.put(_Fields.FINISH, new org.apache.thrift.meta_data.FieldMetaData("finish", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ColumnSlice.class, metaDataMap);
-  }
-
-  public ColumnSlice() {
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public ColumnSlice(ColumnSlice other) {
-    if (other.isSetStart()) {
-      this.start = org.apache.thrift.TBaseHelper.copyBinary(other.start);
-;
-    }
-    if (other.isSetFinish()) {
-      this.finish = org.apache.thrift.TBaseHelper.copyBinary(other.finish);
-;
-    }
-  }
-
-  public ColumnSlice deepCopy() {
-    return new ColumnSlice(this);
-  }
-
-  @Override
-  public void clear() {
-    this.start = null;
-    this.finish = null;
-  }
-
-  public byte[] getStart() {
-    setStart(org.apache.thrift.TBaseHelper.rightSize(start));
-    return start == null ? null : start.array();
-  }
-
-  public ByteBuffer bufferForStart() {
-    return start;
-  }
-
-  public ColumnSlice setStart(byte[] start) {
-    setStart(start == null ? (ByteBuffer)null : ByteBuffer.wrap(start));
-    return this;
-  }
-
-  public ColumnSlice setStart(ByteBuffer start) {
-    this.start = start;
-    return this;
-  }
-
-  public void unsetStart() {
-    this.start = null;
-  }
-
-  /** Returns true if field start is set (has been assigned a value) and false otherwise */
-  public boolean isSetStart() {
-    return this.start != null;
-  }
-
-  public void setStartIsSet(boolean value) {
-    if (!value) {
-      this.start = null;
-    }
-  }
-
-  public byte[] getFinish() {
-    setFinish(org.apache.thrift.TBaseHelper.rightSize(finish));
-    return finish == null ? null : finish.array();
-  }
-
-  public ByteBuffer bufferForFinish() {
-    return finish;
-  }
-
-  public ColumnSlice setFinish(byte[] finish) {
-    setFinish(finish == null ? (ByteBuffer)null : ByteBuffer.wrap(finish));
-    return this;
-  }
-
-  public ColumnSlice setFinish(ByteBuffer finish) {
-    this.finish = finish;
-    return this;
-  }
-
-  public void unsetFinish() {
-    this.finish = null;
-  }
-
-  /** Returns true if field finish is set (has been assigned a value) and false otherwise */
-  public boolean isSetFinish() {
-    return this.finish != null;
-  }
-
-  public void setFinishIsSet(boolean value) {
-    if (!value) {
-      this.finish = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case START:
-      if (value == null) {
-        unsetStart();
-      } else {
-        setStart((ByteBuffer)value);
-      }
-      break;
-
-    case FINISH:
-      if (value == null) {
-        unsetFinish();
-      } else {
-        setFinish((ByteBuffer)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case START:
-      return getStart();
-
-    case FINISH:
-      return getFinish();
-
-    }
-    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 START:
-      return isSetStart();
-    case FINISH:
-      return isSetFinish();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof ColumnSlice)
-      return this.equals((ColumnSlice)that);
-    return false;
-  }
-
-  public boolean equals(ColumnSlice that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_start = true && this.isSetStart();
-    boolean that_present_start = true && that.isSetStart();
-    if (this_present_start || that_present_start) {
-      if (!(this_present_start && that_present_start))
-        return false;
-      if (!this.start.equals(that.start))
-        return false;
-    }
-
-    boolean this_present_finish = true && this.isSetFinish();
-    boolean that_present_finish = true && that.isSetFinish();
-    if (this_present_finish || that_present_finish) {
-      if (!(this_present_finish && that_present_finish))
-        return false;
-      if (!this.finish.equals(that.finish))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
-
-    boolean present_start = true && (isSetStart());
-    builder.append(present_start);
-    if (present_start)
-      builder.append(start);
-
-    boolean present_finish = true && (isSetFinish());
-    builder.append(present_finish);
-    if (present_finish)
-      builder.append(finish);
-
-    return builder.toHashCode();
-  }
-
-  @Override
-  public int compareTo(ColumnSlice other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetStart()).compareTo(other.isSetStart());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetStart()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start, other.start);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetFinish()).compareTo(other.isSetFinish());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetFinish()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.finish, other.finish);
-      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("ColumnSlice(");
-    boolean first = true;
-
-    if (isSetStart()) {
-      sb.append("start:");
-      if (this.start == null) {
-        sb.append("null");
-      } else {
-        org.apache.thrift.TBaseHelper.toString(this.start, sb);
-      }
-      first = false;
-    }
-    if (isSetFinish()) {
-      if (!first) sb.append(", ");
-      sb.append("finish:");
-      if (this.finish == null) {
-        sb.append("null");
-      } else {
-        org.apache.thrift.TBaseHelper.toString(this.finish, sb);
-      }
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    // 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 ColumnSliceStandardSchemeFactory implements SchemeFactory {
-    public ColumnSliceStandardScheme getScheme() {
-      return new ColumnSliceStandardScheme();
-    }
-  }
-
-  private static class ColumnSliceStandardScheme extends StandardScheme<ColumnSlice> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ColumnSlice 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: // START
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.start = iprot.readBinary();
-              struct.setStartIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // FINISH
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.finish = iprot.readBinary();
-              struct.setFinishIsSet(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, ColumnSlice struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.start != null) {
-        if (struct.isSetStart()) {
-          oprot.writeFieldBegin(START_FIELD_DESC);
-          oprot.writeBinary(struct.start);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.finish != null) {
-        if (struct.isSetFinish()) {
-          oprot.writeFieldBegin(FINISH_FIELD_DESC);
-          oprot.writeBinary(struct.finish);
-          oprot.writeFieldEnd();
-        }
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class ColumnSliceTupleSchemeFactory implements SchemeFactory {
-    public ColumnSliceTupleScheme getScheme() {
-      return new ColumnSliceTupleScheme();
-    }
-  }
-
-  private static class ColumnSliceTupleScheme extends TupleScheme<ColumnSlice> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ColumnSlice struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetStart()) {
-        optionals.set(0);
-      }
-      if (struct.isSetFinish()) {
-        optionals.set(1);
-      }
-      oprot.writeBitSet(optionals, 2);
-      if (struct.isSetStart()) {
-        oprot.writeBinary(struct.start);
-      }
-      if (struct.isSetFinish()) {
-        oprot.writeBinary(struct.finish);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ColumnSlice struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.start = iprot.readBinary();
-        struct.setStartIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.finish = iprot.readBinary();
-        struct.setFinishIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/interface/thrift/gen-java/org/apache/cassandra/thrift/Compression.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/Compression.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/Compression.java
deleted file mode 100644
index acaf43f..0000000
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Compression.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;
-
-/**
- * CQL query compression
- */
-public enum Compression implements org.apache.thrift.TEnum {
-  GZIP(1),
-  NONE(2);
-
-  private final int value;
-
-  private Compression(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 Compression findByValue(int value) { 
-    switch (value) {
-      case 1:
-        return GZIP;
-      case 2:
-        return NONE;
-      default:
-        return null;
-    }
-  }
-}