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:38 UTC

[14/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/Mutation.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java
deleted file mode 100644
index 981d5a4..0000000
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java
+++ /dev/null
@@ -1,537 +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;
-
-/**
- * A Mutation is either an insert (represented by filling column_or_supercolumn) or a deletion (represented by filling the deletion attribute).
- * @param column_or_supercolumn. An insert to a column or supercolumn (possibly counter column or supercolumn)
- * @param deletion. A deletion of a column or supercolumn
- */
-public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fields>, java.io.Serializable, Cloneable, Comparable<Mutation> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Mutation");
-
-  private static final org.apache.thrift.protocol.TField COLUMN_OR_SUPERCOLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("column_or_supercolumn", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-  private static final org.apache.thrift.protocol.TField DELETION_FIELD_DESC = new org.apache.thrift.protocol.TField("deletion", org.apache.thrift.protocol.TType.STRUCT, (short)2);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new MutationStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new MutationTupleSchemeFactory());
-  }
-
-  public ColumnOrSuperColumn column_or_supercolumn; // optional
-  public Deletion deletion; // 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_OR_SUPERCOLUMN((short)1, "column_or_supercolumn"),
-    DELETION((short)2, "deletion");
-
-    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_OR_SUPERCOLUMN
-          return COLUMN_OR_SUPERCOLUMN;
-        case 2: // DELETION
-          return DELETION;
-        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_OR_SUPERCOLUMN,_Fields.DELETION};
-  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_OR_SUPERCOLUMN, new org.apache.thrift.meta_data.FieldMetaData("column_or_supercolumn", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ColumnOrSuperColumn.class)));
-    tmpMap.put(_Fields.DELETION, new org.apache.thrift.meta_data.FieldMetaData("deletion", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Deletion.class)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Mutation.class, metaDataMap);
-  }
-
-  public Mutation() {
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public Mutation(Mutation other) {
-    if (other.isSetColumn_or_supercolumn()) {
-      this.column_or_supercolumn = new ColumnOrSuperColumn(other.column_or_supercolumn);
-    }
-    if (other.isSetDeletion()) {
-      this.deletion = new Deletion(other.deletion);
-    }
-  }
-
-  public Mutation deepCopy() {
-    return new Mutation(this);
-  }
-
-  @Override
-  public void clear() {
-    this.column_or_supercolumn = null;
-    this.deletion = null;
-  }
-
-  public ColumnOrSuperColumn getColumn_or_supercolumn() {
-    return this.column_or_supercolumn;
-  }
-
-  public Mutation setColumn_or_supercolumn(ColumnOrSuperColumn column_or_supercolumn) {
-    this.column_or_supercolumn = column_or_supercolumn;
-    return this;
-  }
-
-  public void unsetColumn_or_supercolumn() {
-    this.column_or_supercolumn = null;
-  }
-
-  /** Returns true if field column_or_supercolumn is set (has been assigned a value) and false otherwise */
-  public boolean isSetColumn_or_supercolumn() {
-    return this.column_or_supercolumn != null;
-  }
-
-  public void setColumn_or_supercolumnIsSet(boolean value) {
-    if (!value) {
-      this.column_or_supercolumn = null;
-    }
-  }
-
-  public Deletion getDeletion() {
-    return this.deletion;
-  }
-
-  public Mutation setDeletion(Deletion deletion) {
-    this.deletion = deletion;
-    return this;
-  }
-
-  public void unsetDeletion() {
-    this.deletion = null;
-  }
-
-  /** Returns true if field deletion is set (has been assigned a value) and false otherwise */
-  public boolean isSetDeletion() {
-    return this.deletion != null;
-  }
-
-  public void setDeletionIsSet(boolean value) {
-    if (!value) {
-      this.deletion = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case COLUMN_OR_SUPERCOLUMN:
-      if (value == null) {
-        unsetColumn_or_supercolumn();
-      } else {
-        setColumn_or_supercolumn((ColumnOrSuperColumn)value);
-      }
-      break;
-
-    case DELETION:
-      if (value == null) {
-        unsetDeletion();
-      } else {
-        setDeletion((Deletion)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case COLUMN_OR_SUPERCOLUMN:
-      return getColumn_or_supercolumn();
-
-    case DELETION:
-      return getDeletion();
-
-    }
-    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_OR_SUPERCOLUMN:
-      return isSetColumn_or_supercolumn();
-    case DELETION:
-      return isSetDeletion();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof Mutation)
-      return this.equals((Mutation)that);
-    return false;
-  }
-
-  public boolean equals(Mutation that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_column_or_supercolumn = true && this.isSetColumn_or_supercolumn();
-    boolean that_present_column_or_supercolumn = true && that.isSetColumn_or_supercolumn();
-    if (this_present_column_or_supercolumn || that_present_column_or_supercolumn) {
-      if (!(this_present_column_or_supercolumn && that_present_column_or_supercolumn))
-        return false;
-      if (!this.column_or_supercolumn.equals(that.column_or_supercolumn))
-        return false;
-    }
-
-    boolean this_present_deletion = true && this.isSetDeletion();
-    boolean that_present_deletion = true && that.isSetDeletion();
-    if (this_present_deletion || that_present_deletion) {
-      if (!(this_present_deletion && that_present_deletion))
-        return false;
-      if (!this.deletion.equals(that.deletion))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
-
-    boolean present_column_or_supercolumn = true && (isSetColumn_or_supercolumn());
-    builder.append(present_column_or_supercolumn);
-    if (present_column_or_supercolumn)
-      builder.append(column_or_supercolumn);
-
-    boolean present_deletion = true && (isSetDeletion());
-    builder.append(present_deletion);
-    if (present_deletion)
-      builder.append(deletion);
-
-    return builder.toHashCode();
-  }
-
-  @Override
-  public int compareTo(Mutation other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetColumn_or_supercolumn()).compareTo(other.isSetColumn_or_supercolumn());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetColumn_or_supercolumn()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_or_supercolumn, other.column_or_supercolumn);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetDeletion()).compareTo(other.isSetDeletion());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetDeletion()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.deletion, other.deletion);
-      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("Mutation(");
-    boolean first = true;
-
-    if (isSetColumn_or_supercolumn()) {
-      sb.append("column_or_supercolumn:");
-      if (this.column_or_supercolumn == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.column_or_supercolumn);
-      }
-      first = false;
-    }
-    if (isSetDeletion()) {
-      if (!first) sb.append(", ");
-      sb.append("deletion:");
-      if (this.deletion == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.deletion);
-      }
-      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_or_supercolumn != null) {
-      column_or_supercolumn.validate();
-    }
-    if (deletion != null) {
-      deletion.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 MutationStandardSchemeFactory implements SchemeFactory {
-    public MutationStandardScheme getScheme() {
-      return new MutationStandardScheme();
-    }
-  }
-
-  private static class MutationStandardScheme extends StandardScheme<Mutation> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, Mutation 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_OR_SUPERCOLUMN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.column_or_supercolumn = new ColumnOrSuperColumn();
-              struct.column_or_supercolumn.read(iprot);
-              struct.setColumn_or_supercolumnIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // DELETION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.deletion = new Deletion();
-              struct.deletion.read(iprot);
-              struct.setDeletionIsSet(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, Mutation struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.column_or_supercolumn != null) {
-        if (struct.isSetColumn_or_supercolumn()) {
-          oprot.writeFieldBegin(COLUMN_OR_SUPERCOLUMN_FIELD_DESC);
-          struct.column_or_supercolumn.write(oprot);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.deletion != null) {
-        if (struct.isSetDeletion()) {
-          oprot.writeFieldBegin(DELETION_FIELD_DESC);
-          struct.deletion.write(oprot);
-          oprot.writeFieldEnd();
-        }
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class MutationTupleSchemeFactory implements SchemeFactory {
-    public MutationTupleScheme getScheme() {
-      return new MutationTupleScheme();
-    }
-  }
-
-  private static class MutationTupleScheme extends TupleScheme<Mutation> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, Mutation struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetColumn_or_supercolumn()) {
-        optionals.set(0);
-      }
-      if (struct.isSetDeletion()) {
-        optionals.set(1);
-      }
-      oprot.writeBitSet(optionals, 2);
-      if (struct.isSetColumn_or_supercolumn()) {
-        struct.column_or_supercolumn.write(oprot);
-      }
-      if (struct.isSetDeletion()) {
-        struct.deletion.write(oprot);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, Mutation struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.column_or_supercolumn = new ColumnOrSuperColumn();
-        struct.column_or_supercolumn.read(iprot);
-        struct.setColumn_or_supercolumnIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.deletion = new Deletion();
-        struct.deletion.read(iprot);
-        struct.setDeletionIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
deleted file mode 100644
index 0bd8cee..0000000
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
+++ /dev/null
@@ -1,307 +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;
-
-/**
- * A specific column was requested that does not exist.
- */
-public class NotFoundException extends TException implements org.apache.thrift.TBase<NotFoundException, NotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<NotFoundException> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotFoundException");
-
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new NotFoundExceptionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new NotFoundExceptionTupleSchemeFactory());
-  }
-
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-;
-
-    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) {
-        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;
-    }
-  }
-  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);
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NotFoundException.class, metaDataMap);
-  }
-
-  public NotFoundException() {
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public NotFoundException(NotFoundException other) {
-  }
-
-  public NotFoundException deepCopy() {
-    return new NotFoundException(this);
-  }
-
-  @Override
-  public void clear() {
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    }
-    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) {
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof NotFoundException)
-      return this.equals((NotFoundException)that);
-    return false;
-  }
-
-  public boolean equals(NotFoundException that) {
-    if (that == null)
-      return false;
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
-
-    return builder.toHashCode();
-  }
-
-  @Override
-  public int compareTo(NotFoundException other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    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("NotFoundException(");
-    boolean first = true;
-
-    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 NotFoundExceptionStandardSchemeFactory implements SchemeFactory {
-    public NotFoundExceptionStandardScheme getScheme() {
-      return new NotFoundExceptionStandardScheme();
-    }
-  }
-
-  private static class NotFoundExceptionStandardScheme extends StandardScheme<NotFoundException> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, NotFoundException 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) {
-          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, NotFoundException struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class NotFoundExceptionTupleSchemeFactory implements SchemeFactory {
-    public NotFoundExceptionTupleScheme getScheme() {
-      return new NotFoundExceptionTupleScheme();
-    }
-  }
-
-  private static class NotFoundExceptionTupleScheme extends TupleScheme<NotFoundException> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, NotFoundException struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, NotFoundException struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java
deleted file mode 100644
index 003b822..0000000
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java
+++ /dev/null
@@ -1,310 +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;
-
-/**
- * NOTE: This up outdated exception left for backward compatibility reasons,
- * no actual schema agreement validation is done starting from Cassandra 1.2
- * 
- * schemas are not in agreement across all nodes
- */
-public class SchemaDisagreementException extends TException implements org.apache.thrift.TBase<SchemaDisagreementException, SchemaDisagreementException._Fields>, java.io.Serializable, Cloneable, Comparable<SchemaDisagreementException> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SchemaDisagreementException");
-
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new SchemaDisagreementExceptionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new SchemaDisagreementExceptionTupleSchemeFactory());
-  }
-
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-;
-
-    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) {
-        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;
-    }
-  }
-  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);
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SchemaDisagreementException.class, metaDataMap);
-  }
-
-  public SchemaDisagreementException() {
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public SchemaDisagreementException(SchemaDisagreementException other) {
-  }
-
-  public SchemaDisagreementException deepCopy() {
-    return new SchemaDisagreementException(this);
-  }
-
-  @Override
-  public void clear() {
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    }
-    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) {
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof SchemaDisagreementException)
-      return this.equals((SchemaDisagreementException)that);
-    return false;
-  }
-
-  public boolean equals(SchemaDisagreementException that) {
-    if (that == null)
-      return false;
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
-
-    return builder.toHashCode();
-  }
-
-  @Override
-  public int compareTo(SchemaDisagreementException other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    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("SchemaDisagreementException(");
-    boolean first = true;
-
-    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 SchemaDisagreementExceptionStandardSchemeFactory implements SchemeFactory {
-    public SchemaDisagreementExceptionStandardScheme getScheme() {
-      return new SchemaDisagreementExceptionStandardScheme();
-    }
-  }
-
-  private static class SchemaDisagreementExceptionStandardScheme extends StandardScheme<SchemaDisagreementException> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, SchemaDisagreementException 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) {
-          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, SchemaDisagreementException struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class SchemaDisagreementExceptionTupleSchemeFactory implements SchemeFactory {
-    public SchemaDisagreementExceptionTupleScheme getScheme() {
-      return new SchemaDisagreementExceptionTupleScheme();
-    }
-  }
-
-  private static class SchemaDisagreementExceptionTupleScheme extends TupleScheme<SchemaDisagreementException> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, SchemaDisagreementException struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, SchemaDisagreementException struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java
deleted file mode 100644
index 9d46680..0000000
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java
+++ /dev/null
@@ -1,588 +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;
-
-/**
- * A SlicePredicate is similar to a mathematic predicate (see http://en.wikipedia.org/wiki/Predicate_(mathematical_logic)),
- * which is described as "a property that the elements of a set have in common."
- * 
- * SlicePredicate's in Cassandra are described with either a list of column_names or a SliceRange.  If column_names is
- * specified, slice_range is ignored.
- * 
- * @param column_name. A list of column names to retrieve. This can be used similar to Memcached's "multi-get" feature
- *                     to fetch N known column names. For instance, if you know you wish to fetch columns 'Joe', 'Jack',
- *                     and 'Jim' you can pass those column names as a list to fetch all three at once.
- * @param slice_range. A SliceRange describing how to range, order, and/or limit the slice.
- */
-public class SlicePredicate implements org.apache.thrift.TBase<SlicePredicate, SlicePredicate._Fields>, java.io.Serializable, Cloneable, Comparable<SlicePredicate> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SlicePredicate");
-
-  private static final org.apache.thrift.protocol.TField COLUMN_NAMES_FIELD_DESC = new org.apache.thrift.protocol.TField("column_names", org.apache.thrift.protocol.TType.LIST, (short)1);
-  private static final org.apache.thrift.protocol.TField SLICE_RANGE_FIELD_DESC = new org.apache.thrift.protocol.TField("slice_range", org.apache.thrift.protocol.TType.STRUCT, (short)2);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new SlicePredicateStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new SlicePredicateTupleSchemeFactory());
-  }
-
-  public List<ByteBuffer> column_names; // optional
-  public SliceRange slice_range; // 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_NAMES((short)1, "column_names"),
-    SLICE_RANGE((short)2, "slice_range");
-
-    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_NAMES
-          return COLUMN_NAMES;
-        case 2: // SLICE_RANGE
-          return SLICE_RANGE;
-        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_NAMES,_Fields.SLICE_RANGE};
-  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_NAMES, new org.apache.thrift.meta_data.FieldMetaData("column_names", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING            , true))));
-    tmpMap.put(_Fields.SLICE_RANGE, new org.apache.thrift.meta_data.FieldMetaData("slice_range", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SliceRange.class)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SlicePredicate.class, metaDataMap);
-  }
-
-  public SlicePredicate() {
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public SlicePredicate(SlicePredicate other) {
-    if (other.isSetColumn_names()) {
-      List<ByteBuffer> __this__column_names = new ArrayList<ByteBuffer>(other.column_names);
-      this.column_names = __this__column_names;
-    }
-    if (other.isSetSlice_range()) {
-      this.slice_range = new SliceRange(other.slice_range);
-    }
-  }
-
-  public SlicePredicate deepCopy() {
-    return new SlicePredicate(this);
-  }
-
-  @Override
-  public void clear() {
-    this.column_names = null;
-    this.slice_range = null;
-  }
-
-  public int getColumn_namesSize() {
-    return (this.column_names == null) ? 0 : this.column_names.size();
-  }
-
-  public java.util.Iterator<ByteBuffer> getColumn_namesIterator() {
-    return (this.column_names == null) ? null : this.column_names.iterator();
-  }
-
-  public void addToColumn_names(ByteBuffer elem) {
-    if (this.column_names == null) {
-      this.column_names = new ArrayList<ByteBuffer>();
-    }
-    this.column_names.add(elem);
-  }
-
-  public List<ByteBuffer> getColumn_names() {
-    return this.column_names;
-  }
-
-  public SlicePredicate setColumn_names(List<ByteBuffer> column_names) {
-    this.column_names = column_names;
-    return this;
-  }
-
-  public void unsetColumn_names() {
-    this.column_names = null;
-  }
-
-  /** Returns true if field column_names is set (has been assigned a value) and false otherwise */
-  public boolean isSetColumn_names() {
-    return this.column_names != null;
-  }
-
-  public void setColumn_namesIsSet(boolean value) {
-    if (!value) {
-      this.column_names = null;
-    }
-  }
-
-  public SliceRange getSlice_range() {
-    return this.slice_range;
-  }
-
-  public SlicePredicate setSlice_range(SliceRange slice_range) {
-    this.slice_range = slice_range;
-    return this;
-  }
-
-  public void unsetSlice_range() {
-    this.slice_range = null;
-  }
-
-  /** Returns true if field slice_range is set (has been assigned a value) and false otherwise */
-  public boolean isSetSlice_range() {
-    return this.slice_range != null;
-  }
-
-  public void setSlice_rangeIsSet(boolean value) {
-    if (!value) {
-      this.slice_range = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case COLUMN_NAMES:
-      if (value == null) {
-        unsetColumn_names();
-      } else {
-        setColumn_names((List<ByteBuffer>)value);
-      }
-      break;
-
-    case SLICE_RANGE:
-      if (value == null) {
-        unsetSlice_range();
-      } else {
-        setSlice_range((SliceRange)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case COLUMN_NAMES:
-      return getColumn_names();
-
-    case SLICE_RANGE:
-      return getSlice_range();
-
-    }
-    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_NAMES:
-      return isSetColumn_names();
-    case SLICE_RANGE:
-      return isSetSlice_range();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof SlicePredicate)
-      return this.equals((SlicePredicate)that);
-    return false;
-  }
-
-  public boolean equals(SlicePredicate that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_column_names = true && this.isSetColumn_names();
-    boolean that_present_column_names = true && that.isSetColumn_names();
-    if (this_present_column_names || that_present_column_names) {
-      if (!(this_present_column_names && that_present_column_names))
-        return false;
-      if (!this.column_names.equals(that.column_names))
-        return false;
-    }
-
-    boolean this_present_slice_range = true && this.isSetSlice_range();
-    boolean that_present_slice_range = true && that.isSetSlice_range();
-    if (this_present_slice_range || that_present_slice_range) {
-      if (!(this_present_slice_range && that_present_slice_range))
-        return false;
-      if (!this.slice_range.equals(that.slice_range))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
-
-    boolean present_column_names = true && (isSetColumn_names());
-    builder.append(present_column_names);
-    if (present_column_names)
-      builder.append(column_names);
-
-    boolean present_slice_range = true && (isSetSlice_range());
-    builder.append(present_slice_range);
-    if (present_slice_range)
-      builder.append(slice_range);
-
-    return builder.toHashCode();
-  }
-
-  @Override
-  public int compareTo(SlicePredicate other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetColumn_names()).compareTo(other.isSetColumn_names());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetColumn_names()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_names, other.column_names);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetSlice_range()).compareTo(other.isSetSlice_range());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetSlice_range()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.slice_range, other.slice_range);
-      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("SlicePredicate(");
-    boolean first = true;
-
-    if (isSetColumn_names()) {
-      sb.append("column_names:");
-      if (this.column_names == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.column_names);
-      }
-      first = false;
-    }
-    if (isSetSlice_range()) {
-      if (!first) sb.append(", ");
-      sb.append("slice_range:");
-      if (this.slice_range == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.slice_range);
-      }
-      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 (slice_range != null) {
-      slice_range.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 SlicePredicateStandardSchemeFactory implements SchemeFactory {
-    public SlicePredicateStandardScheme getScheme() {
-      return new SlicePredicateStandardScheme();
-    }
-  }
-
-  private static class SlicePredicateStandardScheme extends StandardScheme<SlicePredicate> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, SlicePredicate 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_NAMES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
-                struct.column_names = new ArrayList<ByteBuffer>(_list16.size);
-                for (int _i17 = 0; _i17 < _list16.size; ++_i17)
-                {
-                  ByteBuffer _elem18;
-                  _elem18 = iprot.readBinary();
-                  struct.column_names.add(_elem18);
-                }
-                iprot.readListEnd();
-              }
-              struct.setColumn_namesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // SLICE_RANGE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.slice_range = new SliceRange();
-              struct.slice_range.read(iprot);
-              struct.setSlice_rangeIsSet(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, SlicePredicate struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.column_names != null) {
-        if (struct.isSetColumn_names()) {
-          oprot.writeFieldBegin(COLUMN_NAMES_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.column_names.size()));
-            for (ByteBuffer _iter19 : struct.column_names)
-            {
-              oprot.writeBinary(_iter19);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.slice_range != null) {
-        if (struct.isSetSlice_range()) {
-          oprot.writeFieldBegin(SLICE_RANGE_FIELD_DESC);
-          struct.slice_range.write(oprot);
-          oprot.writeFieldEnd();
-        }
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class SlicePredicateTupleSchemeFactory implements SchemeFactory {
-    public SlicePredicateTupleScheme getScheme() {
-      return new SlicePredicateTupleScheme();
-    }
-  }
-
-  private static class SlicePredicateTupleScheme extends TupleScheme<SlicePredicate> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, SlicePredicate struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetColumn_names()) {
-        optionals.set(0);
-      }
-      if (struct.isSetSlice_range()) {
-        optionals.set(1);
-      }
-      oprot.writeBitSet(optionals, 2);
-      if (struct.isSetColumn_names()) {
-        {
-          oprot.writeI32(struct.column_names.size());
-          for (ByteBuffer _iter20 : struct.column_names)
-          {
-            oprot.writeBinary(_iter20);
-          }
-        }
-      }
-      if (struct.isSetSlice_range()) {
-        struct.slice_range.write(oprot);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, SlicePredicate struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.column_names = new ArrayList<ByteBuffer>(_list21.size);
-          for (int _i22 = 0; _i22 < _list21.size; ++_i22)
-          {
-            ByteBuffer _elem23;
-            _elem23 = iprot.readBinary();
-            struct.column_names.add(_elem23);
-          }
-        }
-        struct.setColumn_namesIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.slice_range = new SliceRange();
-        struct.slice_range.read(iprot);
-        struct.setSlice_rangeIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java
deleted file mode 100644
index 4b96c86..0000000
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java
+++ /dev/null
@@ -1,749 +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;
-
-/**
- * A slice range is a structure that stores basic range, ordering and limit information for a query that will return
- * multiple columns. It could be thought of as Cassandra's version of LIMIT and ORDER BY
- * 
- * @param start. The column name to start the slice with. This attribute is not required, though there is no default value,
- *               and can be safely set to '', i.e., an empty byte array, to start with the first column name. Otherwise, it
- *               must a valid value under the rules of the Comparator defined for the given ColumnFamily.
- * @param finish. The column name to stop the slice at. This attribute is not required, though there is no default value,
- *                and can be safely set to an empty byte array to not stop until 'count' results are seen. Otherwise, it
- *                must also be a valid value to the ColumnFamily Comparator.
- * @param reversed. Whether the results should be ordered in reversed order. Similar to ORDER BY blah DESC in SQL.
- * @param count. How many columns to return. Similar to LIMIT in SQL. May be arbitrarily large, but Thrift will
- *               materialize the whole result into memory before returning it to the client, so be aware that you may
- *               be better served by iterating through slices by passing the last value of one call in as the 'start'
- *               of the next instead of increasing 'count' arbitrarily large.
- */
-public class SliceRange implements org.apache.thrift.TBase<SliceRange, SliceRange._Fields>, java.io.Serializable, Cloneable, Comparable<SliceRange> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SliceRange");
-
-  private static final org.apache.thrift.protocol.TField START_FIELD_DESC = new org.apache.thrift.protocol.TField("start", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField FINISH_FIELD_DESC = new org.apache.thrift.protocol.TField("finish", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField REVERSED_FIELD_DESC = new org.apache.thrift.protocol.TField("reversed", org.apache.thrift.protocol.TType.BOOL, (short)3);
-  private static final org.apache.thrift.protocol.TField COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("count", org.apache.thrift.protocol.TType.I32, (short)4);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new SliceRangeStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new SliceRangeTupleSchemeFactory());
-  }
-
-  public ByteBuffer start; // required
-  public ByteBuffer finish; // required
-  public boolean reversed; // required
-  public int count; // 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 {
-    START((short)1, "start"),
-    FINISH((short)2, "finish"),
-    REVERSED((short)3, "reversed"),
-    COUNT((short)4, "count");
-
-    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;
-        case 3: // REVERSED
-          return REVERSED;
-        case 4: // COUNT
-          return COUNT;
-        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 __REVERSED_ISSET_ID = 0;
-  private static final int __COUNT_ISSET_ID = 1;
-  private byte __isset_bitfield = 0;
-  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.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    tmpMap.put(_Fields.FINISH, new org.apache.thrift.meta_data.FieldMetaData("finish", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    tmpMap.put(_Fields.REVERSED, new org.apache.thrift.meta_data.FieldMetaData("reversed", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.COUNT, new org.apache.thrift.meta_data.FieldMetaData("count", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SliceRange.class, metaDataMap);
-  }
-
-  public SliceRange() {
-    this.reversed = false;
-
-    this.count = 100;
-
-  }
-
-  public SliceRange(
-    ByteBuffer start,
-    ByteBuffer finish,
-    boolean reversed,
-    int count)
-  {
-    this();
-    this.start = start;
-    this.finish = finish;
-    this.reversed = reversed;
-    setReversedIsSet(true);
-    this.count = count;
-    setCountIsSet(true);
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public SliceRange(SliceRange other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetStart()) {
-      this.start = org.apache.thrift.TBaseHelper.copyBinary(other.start);
-;
-    }
-    if (other.isSetFinish()) {
-      this.finish = org.apache.thrift.TBaseHelper.copyBinary(other.finish);
-;
-    }
-    this.reversed = other.reversed;
-    this.count = other.count;
-  }
-
-  public SliceRange deepCopy() {
-    return new SliceRange(this);
-  }
-
-  @Override
-  public void clear() {
-    this.start = null;
-    this.finish = null;
-    this.reversed = false;
-
-    this.count = 100;
-
-  }
-
-  public byte[] getStart() {
-    setStart(org.apache.thrift.TBaseHelper.rightSize(start));
-    return start == null ? null : start.array();
-  }
-
-  public ByteBuffer bufferForStart() {
-    return start;
-  }
-
-  public SliceRange setStart(byte[] start) {
-    setStart(start == null ? (ByteBuffer)null : ByteBuffer.wrap(start));
-    return this;
-  }
-
-  public SliceRange 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 SliceRange setFinish(byte[] finish) {
-    setFinish(finish == null ? (ByteBuffer)null : ByteBuffer.wrap(finish));
-    return this;
-  }
-
-  public SliceRange 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 boolean isReversed() {
-    return this.reversed;
-  }
-
-  public SliceRange setReversed(boolean reversed) {
-    this.reversed = reversed;
-    setReversedIsSet(true);
-    return this;
-  }
-
-  public void unsetReversed() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __REVERSED_ISSET_ID);
-  }
-
-  /** Returns true if field reversed is set (has been assigned a value) and false otherwise */
-  public boolean isSetReversed() {
-    return EncodingUtils.testBit(__isset_bitfield, __REVERSED_ISSET_ID);
-  }
-
-  public void setReversedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REVERSED_ISSET_ID, value);
-  }
-
-  public int getCount() {
-    return this.count;
-  }
-
-  public SliceRange 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 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;
-
-    case REVERSED:
-      if (value == null) {
-        unsetReversed();
-      } else {
-        setReversed((Boolean)value);
-      }
-      break;
-
-    case COUNT:
-      if (value == null) {
-        unsetCount();
-      } else {
-        setCount((Integer)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case START:
-      return getStart();
-
-    case FINISH:
-      return getFinish();
-
-    case REVERSED:
-      return Boolean.valueOf(isReversed());
-
-    case COUNT:
-      return Integer.valueOf(getCount());
-
-    }
-    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();
-    case REVERSED:
-      return isSetReversed();
-    case COUNT:
-      return isSetCount();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof SliceRange)
-      return this.equals((SliceRange)that);
-    return false;
-  }
-
-  public boolean equals(SliceRange 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;
-    }
-
-    boolean this_present_reversed = true;
-    boolean that_present_reversed = true;
-    if (this_present_reversed || that_present_reversed) {
-      if (!(this_present_reversed && that_present_reversed))
-        return false;
-      if (this.reversed != that.reversed)
-        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;
-    }
-
-    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);
-
-    boolean present_reversed = true;
-    builder.append(present_reversed);
-    if (present_reversed)
-      builder.append(reversed);
-
-    boolean present_count = true;
-    builder.append(present_count);
-    if (present_count)
-      builder.append(count);
-
-    return builder.toHashCode();
-  }
-
-  @Override
-  public int compareTo(SliceRange 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;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetReversed()).compareTo(other.isSetReversed());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetReversed()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reversed, other.reversed);
-      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;
-      }
-    }
-    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("SliceRange(");
-    boolean first = true;
-
-    sb.append("start:");
-    if (this.start == null) {
-      sb.append("null");
-    } else {
-      org.apache.thrift.TBaseHelper.toString(this.start, sb);
-    }
-    first = false;
-    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;
-    if (!first) sb.append(", ");
-    sb.append("reversed:");
-    sb.append(this.reversed);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("count:");
-    sb.append(this.count);
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (start == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'start' was not present! Struct: " + toString());
-    }
-    if (finish == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'finish' was not present! Struct: " + toString());
-    }
-    // alas, we cannot check 'reversed' because it's a primitive and you chose the non-beans generator.
-    // alas, we cannot check 'count' because it's a primitive and you chose the non-beans generator.
-    // 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 SliceRangeStandardSchemeFactory implements SchemeFactory {
-    public SliceRangeStandardScheme getScheme() {
-      return new SliceRangeStandardScheme();
-    }
-  }
-
-  private static class SliceRangeStandardScheme extends StandardScheme<SliceRange> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, SliceRange 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;
-          case 3: // REVERSED
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.reversed = iprot.readBool();
-              struct.setReversedIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // 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;
-          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.isSetReversed()) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required field 'reversed' 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, SliceRange struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.start != null) {
-        oprot.writeFieldBegin(START_FIELD_DESC);
-        oprot.writeBinary(struct.start);
-        oprot.writeFieldEnd();
-      }
-      if (struct.finish != null) {
-        oprot.writeFieldBegin(FINISH_FIELD_DESC);
-        oprot.writeBinary(struct.finish);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldBegin(REVERSED_FIELD_DESC);
-      oprot.writeBool(struct.reversed);
-      oprot.writeFieldEnd();
-      oprot.writeFieldBegin(COUNT_FIELD_DESC);
-      oprot.writeI32(struct.count);
-      oprot.writeFieldEnd();
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class SliceRangeTupleSchemeFactory implements SchemeFactory {
-    public SliceRangeTupleScheme getScheme() {
-      return new SliceRangeTupleScheme();
-    }
-  }
-
-  private static class SliceRangeTupleScheme extends TupleScheme<SliceRange> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, SliceRange struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeBinary(struct.start);
-      oprot.writeBinary(struct.finish);
-      oprot.writeBool(struct.reversed);
-      oprot.writeI32(struct.count);
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, SliceRange struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.start = iprot.readBinary();
-      struct.setStartIsSet(true);
-      struct.finish = iprot.readBinary();
-      struct.setFinishIsSet(true);
-      struct.reversed = iprot.readBool();
-      struct.setReversedIsSet(true);
-      struct.count = iprot.readI32();
-      struct.setCountIsSet(true);
-    }
-  }
-
-}
-