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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
----------------------------------------------------------------------
diff --git 
a/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
 
b/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
deleted file mode 100644
index 6038a23..0000000
--- 
a/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
+++ /dev/null
@@ -1,414 +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;
-
-/**
- * Invalid request could mean keyspace or column family does not exist, 
required parameters are missing, or a parameter is malformed.
- * why contains an associated error message.
- */
-public class InvalidRequestException extends TException implements 
org.apache.thrift.TBase<InvalidRequestException, 
InvalidRequestException._Fields>, java.io.Serializable, Cloneable, 
Comparable<InvalidRequestException> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("InvalidRequestException");
-
-  private static final org.apache.thrift.protocol.TField WHY_FIELD_DESC = new 
org.apache.thrift.protocol.TField("why", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new 
InvalidRequestExceptionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new 
InvalidRequestExceptionTupleSchemeFactory());
-  }
-
-  public String why; // 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 {
-    WHY((short)1, "why");
-
-    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: // WHY
-          return WHY;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.WHY, new 
org.apache.thrift.meta_data.FieldMetaData("why", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(InvalidRequestException.class,
 metaDataMap);
-  }
-
-  public InvalidRequestException() {
-  }
-
-  public InvalidRequestException(
-    String why)
-  {
-    this();
-    this.why = why;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public InvalidRequestException(InvalidRequestException other) {
-    if (other.isSetWhy()) {
-      this.why = other.why;
-    }
-  }
-
-  public InvalidRequestException deepCopy() {
-    return new InvalidRequestException(this);
-  }
-
-  @Override
-  public void clear() {
-    this.why = null;
-  }
-
-  public String getWhy() {
-    return this.why;
-  }
-
-  public InvalidRequestException setWhy(String why) {
-    this.why = why;
-    return this;
-  }
-
-  public void unsetWhy() {
-    this.why = null;
-  }
-
-  /** Returns true if field why is set (has been assigned a value) and false 
otherwise */
-  public boolean isSetWhy() {
-    return this.why != null;
-  }
-
-  public void setWhyIsSet(boolean value) {
-    if (!value) {
-      this.why = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case WHY:
-      if (value == null) {
-        unsetWhy();
-      } else {
-        setWhy((String)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case WHY:
-      return getWhy();
-
-    }
-    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 WHY:
-      return isSetWhy();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof InvalidRequestException)
-      return this.equals((InvalidRequestException)that);
-    return false;
-  }
-
-  public boolean equals(InvalidRequestException that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_why = true && this.isSetWhy();
-    boolean that_present_why = true && that.isSetWhy();
-    if (this_present_why || that_present_why) {
-      if (!(this_present_why && that_present_why))
-        return false;
-      if (!this.why.equals(that.why))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
-
-    boolean present_why = true && (isSetWhy());
-    builder.append(present_why);
-    if (present_why)
-      builder.append(why);
-
-    return builder.toHashCode();
-  }
-
-  @Override
-  public int compareTo(InvalidRequestException other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetWhy()).compareTo(other.isSetWhy());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetWhy()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.why, 
other.why);
-      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("InvalidRequestException(");
-    boolean first = true;
-
-    sb.append("why:");
-    if (this.why == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.why);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (why == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 
'why' 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 InvalidRequestExceptionStandardSchemeFactory implements 
SchemeFactory {
-    public InvalidRequestExceptionStandardScheme getScheme() {
-      return new InvalidRequestExceptionStandardScheme();
-    }
-  }
-
-  private static class InvalidRequestExceptionStandardScheme extends 
StandardScheme<InvalidRequestException> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, 
InvalidRequestException 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: // WHY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.why = iprot.readString();
-              struct.setWhyIsSet(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, 
InvalidRequestException struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.why != null) {
-        oprot.writeFieldBegin(WHY_FIELD_DESC);
-        oprot.writeString(struct.why);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class InvalidRequestExceptionTupleSchemeFactory implements 
SchemeFactory {
-    public InvalidRequestExceptionTupleScheme getScheme() {
-      return new InvalidRequestExceptionTupleScheme();
-    }
-  }
-
-  private static class InvalidRequestExceptionTupleScheme extends 
TupleScheme<InvalidRequestException> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, 
InvalidRequestException struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.why);
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, 
InvalidRequestException struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.why = iprot.readString();
-      struct.setWhyIsSet(true);
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyCount.java
----------------------------------------------------------------------
diff --git 
a/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyCount.java 
b/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyCount.java
deleted file mode 100644
index cbb5e51..0000000
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyCount.java
+++ /dev/null
@@ -1,521 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.cassandra.thrift;
-/*
- * 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- */
-
-
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class KeyCount implements org.apache.thrift.TBase<KeyCount, 
KeyCount._Fields>, java.io.Serializable, Cloneable, Comparable<KeyCount> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("KeyCount");
-
-  private static final org.apache.thrift.protocol.TField KEY_FIELD_DESC = new 
org.apache.thrift.protocol.TField("key", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField COUNT_FIELD_DESC = 
new org.apache.thrift.protocol.TField("count", 
org.apache.thrift.protocol.TType.I32, (short)2);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new KeyCountStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new KeyCountTupleSchemeFactory());
-  }
-
-  public ByteBuffer key; // 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 {
-    KEY((short)1, "key"),
-    COUNT((short)2, "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: // KEY
-          return KEY;
-        case 2: // 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 __COUNT_ISSET_ID = 0;
-  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.KEY, new 
org.apache.thrift.meta_data.FieldMetaData("key", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING
        , true)));
-    tmpMap.put(_Fields.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(KeyCount.class, 
metaDataMap);
-  }
-
-  public KeyCount() {
-  }
-
-  public KeyCount(
-    ByteBuffer key,
-    int count)
-  {
-    this();
-    this.key = key;
-    this.count = count;
-    setCountIsSet(true);
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public KeyCount(KeyCount other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetKey()) {
-      this.key = org.apache.thrift.TBaseHelper.copyBinary(other.key);
-;
-    }
-    this.count = other.count;
-  }
-
-  public KeyCount deepCopy() {
-    return new KeyCount(this);
-  }
-
-  @Override
-  public void clear() {
-    this.key = null;
-    setCountIsSet(false);
-    this.count = 0;
-  }
-
-  public byte[] getKey() {
-    setKey(org.apache.thrift.TBaseHelper.rightSize(key));
-    return key == null ? null : key.array();
-  }
-
-  public ByteBuffer bufferForKey() {
-    return key;
-  }
-
-  public KeyCount setKey(byte[] key) {
-    setKey(key == null ? (ByteBuffer)null : ByteBuffer.wrap(key));
-    return this;
-  }
-
-  public KeyCount setKey(ByteBuffer key) {
-    this.key = key;
-    return this;
-  }
-
-  public void unsetKey() {
-    this.key = null;
-  }
-
-  /** Returns true if field key is set (has been assigned a value) and false 
otherwise */
-  public boolean isSetKey() {
-    return this.key != null;
-  }
-
-  public void setKeyIsSet(boolean value) {
-    if (!value) {
-      this.key = null;
-    }
-  }
-
-  public int getCount() {
-    return this.count;
-  }
-
-  public KeyCount 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 KEY:
-      if (value == null) {
-        unsetKey();
-      } else {
-        setKey((ByteBuffer)value);
-      }
-      break;
-
-    case COUNT:
-      if (value == null) {
-        unsetCount();
-      } else {
-        setCount((Integer)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case KEY:
-      return getKey();
-
-    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 KEY:
-      return isSetKey();
-    case COUNT:
-      return isSetCount();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof KeyCount)
-      return this.equals((KeyCount)that);
-    return false;
-  }
-
-  public boolean equals(KeyCount that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_key = true && this.isSetKey();
-    boolean that_present_key = true && that.isSetKey();
-    if (this_present_key || that_present_key) {
-      if (!(this_present_key && that_present_key))
-        return false;
-      if (!this.key.equals(that.key))
-        return false;
-    }
-
-    boolean this_present_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_key = true && (isSetKey());
-    builder.append(present_key);
-    if (present_key)
-      builder.append(key);
-
-    boolean present_count = true;
-    builder.append(present_count);
-    if (present_count)
-      builder.append(count);
-
-    return builder.toHashCode();
-  }
-
-  @Override
-  public int compareTo(KeyCount other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetKey()).compareTo(other.isSetKey());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetKey()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, 
other.key);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = 
Boolean.valueOf(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("KeyCount(");
-    boolean first = true;
-
-    sb.append("key:");
-    if (this.key == null) {
-      sb.append("null");
-    } else {
-      org.apache.thrift.TBaseHelper.toString(this.key, sb);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("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 (key == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 
'key' was not present! Struct: " + toString());
-    }
-    // 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 KeyCountStandardSchemeFactory implements SchemeFactory {
-    public KeyCountStandardScheme getScheme() {
-      return new KeyCountStandardScheme();
-    }
-  }
-
-  private static class KeyCountStandardScheme extends StandardScheme<KeyCount> 
{
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, KeyCount 
struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // KEY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.key = iprot.readBinary();
-              struct.setKeyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          case 2: // 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.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, KeyCount 
struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.key != null) {
-        oprot.writeFieldBegin(KEY_FIELD_DESC);
-        oprot.writeBinary(struct.key);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldBegin(COUNT_FIELD_DESC);
-      oprot.writeI32(struct.count);
-      oprot.writeFieldEnd();
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class KeyCountTupleSchemeFactory implements SchemeFactory {
-    public KeyCountTupleScheme getScheme() {
-      return new KeyCountTupleScheme();
-    }
-  }
-
-  private static class KeyCountTupleScheme extends TupleScheme<KeyCount> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, KeyCount 
struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeBinary(struct.key);
-      oprot.writeI32(struct.count);
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, KeyCount 
struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.key = iprot.readBinary();
-      struct.setKeyIsSet(true);
-      struct.count = iprot.readI32();
-      struct.setCountIsSet(true);
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java
----------------------------------------------------------------------
diff --git 
a/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java 
b/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java
deleted file mode 100644
index 0168410..0000000
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java
+++ /dev/null
@@ -1,1034 +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 semantics of start keys and tokens are slightly different.
- * Keys are start-inclusive; tokens are start-exclusive.  Token
- * ranges may also wrap -- that is, the end token may be less
- * than the start one.  Thus, a range from keyX to keyX is a
- * one-element range, but a range from tokenY to tokenY is the
- * full ring.
- */
-public class KeyRange implements org.apache.thrift.TBase<KeyRange, 
KeyRange._Fields>, java.io.Serializable, Cloneable, Comparable<KeyRange> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("KeyRange");
-
-  private static final org.apache.thrift.protocol.TField START_KEY_FIELD_DESC 
= new org.apache.thrift.protocol.TField("start_key", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField END_KEY_FIELD_DESC = 
new org.apache.thrift.protocol.TField("end_key", 
org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField 
START_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("start_token", 
org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField END_TOKEN_FIELD_DESC 
= new org.apache.thrift.protocol.TField("end_token", 
org.apache.thrift.protocol.TType.STRING, (short)4);
-  private static final org.apache.thrift.protocol.TField ROW_FILTER_FIELD_DESC 
= new org.apache.thrift.protocol.TField("row_filter", 
org.apache.thrift.protocol.TType.LIST, (short)6);
-  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)5);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new KeyRangeStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new KeyRangeTupleSchemeFactory());
-  }
-
-  public ByteBuffer start_key; // optional
-  public ByteBuffer end_key; // optional
-  public String start_token; // optional
-  public String end_token; // optional
-  public List<IndexExpression> row_filter; // optional
-  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_KEY((short)1, "start_key"),
-    END_KEY((short)2, "end_key"),
-    START_TOKEN((short)3, "start_token"),
-    END_TOKEN((short)4, "end_token"),
-    ROW_FILTER((short)6, "row_filter"),
-    COUNT((short)5, "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_KEY
-          return START_KEY;
-        case 2: // END_KEY
-          return END_KEY;
-        case 3: // START_TOKEN
-          return START_TOKEN;
-        case 4: // END_TOKEN
-          return END_TOKEN;
-        case 6: // ROW_FILTER
-          return ROW_FILTER;
-        case 5: // 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 __COUNT_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  private _Fields optionals[] = 
{_Fields.START_KEY,_Fields.END_KEY,_Fields.START_TOKEN,_Fields.END_TOKEN,_Fields.ROW_FILTER};
-  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_KEY, new 
org.apache.thrift.meta_data.FieldMetaData("start_key", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING
        , true)));
-    tmpMap.put(_Fields.END_KEY, new 
org.apache.thrift.meta_data.FieldMetaData("end_key", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING
        , true)));
-    tmpMap.put(_Fields.START_TOKEN, new 
org.apache.thrift.meta_data.FieldMetaData("start_token", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.END_TOKEN, new 
org.apache.thrift.meta_data.FieldMetaData("end_token", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.ROW_FILTER, new 
org.apache.thrift.meta_data.FieldMetaData("row_filter", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new 
org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 IndexExpression.class))));
-    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(KeyRange.class, 
metaDataMap);
-  }
-
-  public KeyRange() {
-    this.count = 100;
-
-  }
-
-  public KeyRange(
-    int count)
-  {
-    this();
-    this.count = count;
-    setCountIsSet(true);
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public KeyRange(KeyRange other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetStart_key()) {
-      this.start_key = 
org.apache.thrift.TBaseHelper.copyBinary(other.start_key);
-;
-    }
-    if (other.isSetEnd_key()) {
-      this.end_key = org.apache.thrift.TBaseHelper.copyBinary(other.end_key);
-;
-    }
-    if (other.isSetStart_token()) {
-      this.start_token = other.start_token;
-    }
-    if (other.isSetEnd_token()) {
-      this.end_token = other.end_token;
-    }
-    if (other.isSetRow_filter()) {
-      List<IndexExpression> __this__row_filter = new 
ArrayList<IndexExpression>(other.row_filter.size());
-      for (IndexExpression other_element : other.row_filter) {
-        __this__row_filter.add(new IndexExpression(other_element));
-      }
-      this.row_filter = __this__row_filter;
-    }
-    this.count = other.count;
-  }
-
-  public KeyRange deepCopy() {
-    return new KeyRange(this);
-  }
-
-  @Override
-  public void clear() {
-    this.start_key = null;
-    this.end_key = null;
-    this.start_token = null;
-    this.end_token = null;
-    this.row_filter = null;
-    this.count = 100;
-
-  }
-
-  public byte[] getStart_key() {
-    setStart_key(org.apache.thrift.TBaseHelper.rightSize(start_key));
-    return start_key == null ? null : start_key.array();
-  }
-
-  public ByteBuffer bufferForStart_key() {
-    return start_key;
-  }
-
-  public KeyRange setStart_key(byte[] start_key) {
-    setStart_key(start_key == null ? (ByteBuffer)null : 
ByteBuffer.wrap(start_key));
-    return this;
-  }
-
-  public KeyRange setStart_key(ByteBuffer start_key) {
-    this.start_key = start_key;
-    return this;
-  }
-
-  public void unsetStart_key() {
-    this.start_key = null;
-  }
-
-  /** Returns true if field start_key is set (has been assigned a value) and 
false otherwise */
-  public boolean isSetStart_key() {
-    return this.start_key != null;
-  }
-
-  public void setStart_keyIsSet(boolean value) {
-    if (!value) {
-      this.start_key = null;
-    }
-  }
-
-  public byte[] getEnd_key() {
-    setEnd_key(org.apache.thrift.TBaseHelper.rightSize(end_key));
-    return end_key == null ? null : end_key.array();
-  }
-
-  public ByteBuffer bufferForEnd_key() {
-    return end_key;
-  }
-
-  public KeyRange setEnd_key(byte[] end_key) {
-    setEnd_key(end_key == null ? (ByteBuffer)null : ByteBuffer.wrap(end_key));
-    return this;
-  }
-
-  public KeyRange setEnd_key(ByteBuffer end_key) {
-    this.end_key = end_key;
-    return this;
-  }
-
-  public void unsetEnd_key() {
-    this.end_key = null;
-  }
-
-  /** Returns true if field end_key is set (has been assigned a value) and 
false otherwise */
-  public boolean isSetEnd_key() {
-    return this.end_key != null;
-  }
-
-  public void setEnd_keyIsSet(boolean value) {
-    if (!value) {
-      this.end_key = null;
-    }
-  }
-
-  public String getStart_token() {
-    return this.start_token;
-  }
-
-  public KeyRange setStart_token(String start_token) {
-    this.start_token = start_token;
-    return this;
-  }
-
-  public void unsetStart_token() {
-    this.start_token = null;
-  }
-
-  /** Returns true if field start_token is set (has been assigned a value) and 
false otherwise */
-  public boolean isSetStart_token() {
-    return this.start_token != null;
-  }
-
-  public void setStart_tokenIsSet(boolean value) {
-    if (!value) {
-      this.start_token = null;
-    }
-  }
-
-  public String getEnd_token() {
-    return this.end_token;
-  }
-
-  public KeyRange setEnd_token(String end_token) {
-    this.end_token = end_token;
-    return this;
-  }
-
-  public void unsetEnd_token() {
-    this.end_token = null;
-  }
-
-  /** Returns true if field end_token is set (has been assigned a value) and 
false otherwise */
-  public boolean isSetEnd_token() {
-    return this.end_token != null;
-  }
-
-  public void setEnd_tokenIsSet(boolean value) {
-    if (!value) {
-      this.end_token = null;
-    }
-  }
-
-  public int getRow_filterSize() {
-    return (this.row_filter == null) ? 0 : this.row_filter.size();
-  }
-
-  public java.util.Iterator<IndexExpression> getRow_filterIterator() {
-    return (this.row_filter == null) ? null : this.row_filter.iterator();
-  }
-
-  public void addToRow_filter(IndexExpression elem) {
-    if (this.row_filter == null) {
-      this.row_filter = new ArrayList<IndexExpression>();
-    }
-    this.row_filter.add(elem);
-  }
-
-  public List<IndexExpression> getRow_filter() {
-    return this.row_filter;
-  }
-
-  public KeyRange setRow_filter(List<IndexExpression> row_filter) {
-    this.row_filter = row_filter;
-    return this;
-  }
-
-  public void unsetRow_filter() {
-    this.row_filter = null;
-  }
-
-  /** Returns true if field row_filter is set (has been assigned a value) and 
false otherwise */
-  public boolean isSetRow_filter() {
-    return this.row_filter != null;
-  }
-
-  public void setRow_filterIsSet(boolean value) {
-    if (!value) {
-      this.row_filter = null;
-    }
-  }
-
-  public int getCount() {
-    return this.count;
-  }
-
-  public KeyRange 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_KEY:
-      if (value == null) {
-        unsetStart_key();
-      } else {
-        setStart_key((ByteBuffer)value);
-      }
-      break;
-
-    case END_KEY:
-      if (value == null) {
-        unsetEnd_key();
-      } else {
-        setEnd_key((ByteBuffer)value);
-      }
-      break;
-
-    case START_TOKEN:
-      if (value == null) {
-        unsetStart_token();
-      } else {
-        setStart_token((String)value);
-      }
-      break;
-
-    case END_TOKEN:
-      if (value == null) {
-        unsetEnd_token();
-      } else {
-        setEnd_token((String)value);
-      }
-      break;
-
-    case ROW_FILTER:
-      if (value == null) {
-        unsetRow_filter();
-      } else {
-        setRow_filter((List<IndexExpression>)value);
-      }
-      break;
-
-    case COUNT:
-      if (value == null) {
-        unsetCount();
-      } else {
-        setCount((Integer)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case START_KEY:
-      return getStart_key();
-
-    case END_KEY:
-      return getEnd_key();
-
-    case START_TOKEN:
-      return getStart_token();
-
-    case END_TOKEN:
-      return getEnd_token();
-
-    case ROW_FILTER:
-      return getRow_filter();
-
-    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_KEY:
-      return isSetStart_key();
-    case END_KEY:
-      return isSetEnd_key();
-    case START_TOKEN:
-      return isSetStart_token();
-    case END_TOKEN:
-      return isSetEnd_token();
-    case ROW_FILTER:
-      return isSetRow_filter();
-    case COUNT:
-      return isSetCount();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof KeyRange)
-      return this.equals((KeyRange)that);
-    return false;
-  }
-
-  public boolean equals(KeyRange that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_start_key = true && this.isSetStart_key();
-    boolean that_present_start_key = true && that.isSetStart_key();
-    if (this_present_start_key || that_present_start_key) {
-      if (!(this_present_start_key && that_present_start_key))
-        return false;
-      if (!this.start_key.equals(that.start_key))
-        return false;
-    }
-
-    boolean this_present_end_key = true && this.isSetEnd_key();
-    boolean that_present_end_key = true && that.isSetEnd_key();
-    if (this_present_end_key || that_present_end_key) {
-      if (!(this_present_end_key && that_present_end_key))
-        return false;
-      if (!this.end_key.equals(that.end_key))
-        return false;
-    }
-
-    boolean this_present_start_token = true && this.isSetStart_token();
-    boolean that_present_start_token = true && that.isSetStart_token();
-    if (this_present_start_token || that_present_start_token) {
-      if (!(this_present_start_token && that_present_start_token))
-        return false;
-      if (!this.start_token.equals(that.start_token))
-        return false;
-    }
-
-    boolean this_present_end_token = true && this.isSetEnd_token();
-    boolean that_present_end_token = true && that.isSetEnd_token();
-    if (this_present_end_token || that_present_end_token) {
-      if (!(this_present_end_token && that_present_end_token))
-        return false;
-      if (!this.end_token.equals(that.end_token))
-        return false;
-    }
-
-    boolean this_present_row_filter = true && this.isSetRow_filter();
-    boolean that_present_row_filter = true && that.isSetRow_filter();
-    if (this_present_row_filter || that_present_row_filter) {
-      if (!(this_present_row_filter && that_present_row_filter))
-        return false;
-      if (!this.row_filter.equals(that.row_filter))
-        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_key = true && (isSetStart_key());
-    builder.append(present_start_key);
-    if (present_start_key)
-      builder.append(start_key);
-
-    boolean present_end_key = true && (isSetEnd_key());
-    builder.append(present_end_key);
-    if (present_end_key)
-      builder.append(end_key);
-
-    boolean present_start_token = true && (isSetStart_token());
-    builder.append(present_start_token);
-    if (present_start_token)
-      builder.append(start_token);
-
-    boolean present_end_token = true && (isSetEnd_token());
-    builder.append(present_end_token);
-    if (present_end_token)
-      builder.append(end_token);
-
-    boolean present_row_filter = true && (isSetRow_filter());
-    builder.append(present_row_filter);
-    if (present_row_filter)
-      builder.append(row_filter);
-
-    boolean present_count = true;
-    builder.append(present_count);
-    if (present_count)
-      builder.append(count);
-
-    return builder.toHashCode();
-  }
-
-  @Override
-  public int compareTo(KeyRange other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = 
Boolean.valueOf(isSetStart_key()).compareTo(other.isSetStart_key());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetStart_key()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start_key, 
other.start_key);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = 
Boolean.valueOf(isSetEnd_key()).compareTo(other.isSetEnd_key());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetEnd_key()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.end_key, 
other.end_key);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = 
Boolean.valueOf(isSetStart_token()).compareTo(other.isSetStart_token());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetStart_token()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.start_token, other.start_token);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = 
Boolean.valueOf(isSetEnd_token()).compareTo(other.isSetEnd_token());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetEnd_token()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.end_token, 
other.end_token);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = 
Boolean.valueOf(isSetRow_filter()).compareTo(other.isSetRow_filter());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetRow_filter()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.row_filter, other.row_filter);
-      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("KeyRange(");
-    boolean first = true;
-
-    if (isSetStart_key()) {
-      sb.append("start_key:");
-      if (this.start_key == null) {
-        sb.append("null");
-      } else {
-        org.apache.thrift.TBaseHelper.toString(this.start_key, sb);
-      }
-      first = false;
-    }
-    if (isSetEnd_key()) {
-      if (!first) sb.append(", ");
-      sb.append("end_key:");
-      if (this.end_key == null) {
-        sb.append("null");
-      } else {
-        org.apache.thrift.TBaseHelper.toString(this.end_key, sb);
-      }
-      first = false;
-    }
-    if (isSetStart_token()) {
-      if (!first) sb.append(", ");
-      sb.append("start_token:");
-      if (this.start_token == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.start_token);
-      }
-      first = false;
-    }
-    if (isSetEnd_token()) {
-      if (!first) sb.append(", ");
-      sb.append("end_token:");
-      if (this.end_token == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.end_token);
-      }
-      first = false;
-    }
-    if (isSetRow_filter()) {
-      if (!first) sb.append(", ");
-      sb.append("row_filter:");
-      if (this.row_filter == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.row_filter);
-      }
-      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
-    // 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 KeyRangeStandardSchemeFactory implements SchemeFactory {
-    public KeyRangeStandardScheme getScheme() {
-      return new KeyRangeStandardScheme();
-    }
-  }
-
-  private static class KeyRangeStandardScheme extends StandardScheme<KeyRange> 
{
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, KeyRange 
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_KEY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.start_key = iprot.readBinary();
-              struct.setStart_keyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          case 2: // END_KEY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.end_key = iprot.readBinary();
-              struct.setEnd_keyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          case 3: // START_TOKEN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.start_token = iprot.readString();
-              struct.setStart_tokenIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          case 4: // END_TOKEN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.end_token = iprot.readString();
-              struct.setEnd_tokenIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          case 6: // ROW_FILTER
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list32 = 
iprot.readListBegin();
-                struct.row_filter = new 
ArrayList<IndexExpression>(_list32.size);
-                for (int _i33 = 0; _i33 < _list32.size; ++_i33)
-                {
-                  IndexExpression _elem34;
-                  _elem34 = new IndexExpression();
-                  _elem34.read(iprot);
-                  struct.row_filter.add(_elem34);
-                }
-                iprot.readListEnd();
-              }
-              struct.setRow_filterIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          case 5: // 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.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, KeyRange 
struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.start_key != null) {
-        if (struct.isSetStart_key()) {
-          oprot.writeFieldBegin(START_KEY_FIELD_DESC);
-          oprot.writeBinary(struct.start_key);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.end_key != null) {
-        if (struct.isSetEnd_key()) {
-          oprot.writeFieldBegin(END_KEY_FIELD_DESC);
-          oprot.writeBinary(struct.end_key);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.start_token != null) {
-        if (struct.isSetStart_token()) {
-          oprot.writeFieldBegin(START_TOKEN_FIELD_DESC);
-          oprot.writeString(struct.start_token);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.end_token != null) {
-        if (struct.isSetEnd_token()) {
-          oprot.writeFieldBegin(END_TOKEN_FIELD_DESC);
-          oprot.writeString(struct.end_token);
-          oprot.writeFieldEnd();
-        }
-      }
-      oprot.writeFieldBegin(COUNT_FIELD_DESC);
-      oprot.writeI32(struct.count);
-      oprot.writeFieldEnd();
-      if (struct.row_filter != null) {
-        if (struct.isSetRow_filter()) {
-          oprot.writeFieldBegin(ROW_FILTER_FIELD_DESC);
-          {
-            oprot.writeListBegin(new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
struct.row_filter.size()));
-            for (IndexExpression _iter35 : struct.row_filter)
-            {
-              _iter35.write(oprot);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class KeyRangeTupleSchemeFactory implements SchemeFactory {
-    public KeyRangeTupleScheme getScheme() {
-      return new KeyRangeTupleScheme();
-    }
-  }
-
-  private static class KeyRangeTupleScheme extends TupleScheme<KeyRange> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, KeyRange 
struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeI32(struct.count);
-      BitSet optionals = new BitSet();
-      if (struct.isSetStart_key()) {
-        optionals.set(0);
-      }
-      if (struct.isSetEnd_key()) {
-        optionals.set(1);
-      }
-      if (struct.isSetStart_token()) {
-        optionals.set(2);
-      }
-      if (struct.isSetEnd_token()) {
-        optionals.set(3);
-      }
-      if (struct.isSetRow_filter()) {
-        optionals.set(4);
-      }
-      oprot.writeBitSet(optionals, 5);
-      if (struct.isSetStart_key()) {
-        oprot.writeBinary(struct.start_key);
-      }
-      if (struct.isSetEnd_key()) {
-        oprot.writeBinary(struct.end_key);
-      }
-      if (struct.isSetStart_token()) {
-        oprot.writeString(struct.start_token);
-      }
-      if (struct.isSetEnd_token()) {
-        oprot.writeString(struct.end_token);
-      }
-      if (struct.isSetRow_filter()) {
-        {
-          oprot.writeI32(struct.row_filter.size());
-          for (IndexExpression _iter36 : struct.row_filter)
-          {
-            _iter36.write(oprot);
-          }
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, KeyRange 
struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.count = iprot.readI32();
-      struct.setCountIsSet(true);
-      BitSet incoming = iprot.readBitSet(5);
-      if (incoming.get(0)) {
-        struct.start_key = iprot.readBinary();
-        struct.setStart_keyIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.end_key = iprot.readBinary();
-        struct.setEnd_keyIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.start_token = iprot.readString();
-        struct.setStart_tokenIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.end_token = iprot.readString();
-        struct.setEnd_tokenIsSet(true);
-      }
-      if (incoming.get(4)) {
-        {
-          org.apache.thrift.protocol.TList _list37 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
iprot.readI32());
-          struct.row_filter = new ArrayList<IndexExpression>(_list37.size);
-          for (int _i38 = 0; _i38 < _list37.size; ++_i38)
-          {
-            IndexExpression _elem39;
-            _elem39 = new IndexExpression();
-            _elem39.read(iprot);
-            struct.row_filter.add(_elem39);
-          }
-        }
-        struct.setRow_filterIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4881d9c3/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java
----------------------------------------------------------------------
diff --git 
a/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java 
b/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java
deleted file mode 100644
index df4beb1..0000000
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java
+++ /dev/null
@@ -1,583 +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 KeySlice is key followed by the data it maps to. A collection of KeySlice 
is returned by the get_range_slice operation.
- * 
- * @param key. a row key
- * @param columns. List of data represented by the key. Typically, the list is 
pared down to only the columns specified by
- *                 a SlicePredicate.
- */
-public class KeySlice implements org.apache.thrift.TBase<KeySlice, 
KeySlice._Fields>, java.io.Serializable, Cloneable, Comparable<KeySlice> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("KeySlice");
-
-  private static final org.apache.thrift.protocol.TField KEY_FIELD_DESC = new 
org.apache.thrift.protocol.TField("key", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = 
new org.apache.thrift.protocol.TField("columns", 
org.apache.thrift.protocol.TType.LIST, (short)2);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new KeySliceStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new KeySliceTupleSchemeFactory());
-  }
-
-  public ByteBuffer key; // required
-  public List<ColumnOrSuperColumn> columns; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    KEY((short)1, "key"),
-    COLUMNS((short)2, "columns");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, 
_Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not 
found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // KEY
-          return KEY;
-        case 2: // COLUMNS
-          return COLUMNS;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.KEY, new 
org.apache.thrift.meta_data.FieldMetaData("key", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING
        , true)));
-    tmpMap.put(_Fields.COLUMNS, new 
org.apache.thrift.meta_data.FieldMetaData("columns", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new 
org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 ColumnOrSuperColumn.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(KeySlice.class, 
metaDataMap);
-  }
-
-  public KeySlice() {
-  }
-
-  public KeySlice(
-    ByteBuffer key,
-    List<ColumnOrSuperColumn> columns)
-  {
-    this();
-    this.key = key;
-    this.columns = columns;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public KeySlice(KeySlice other) {
-    if (other.isSetKey()) {
-      this.key = org.apache.thrift.TBaseHelper.copyBinary(other.key);
-;
-    }
-    if (other.isSetColumns()) {
-      List<ColumnOrSuperColumn> __this__columns = new 
ArrayList<ColumnOrSuperColumn>(other.columns.size());
-      for (ColumnOrSuperColumn other_element : other.columns) {
-        __this__columns.add(new ColumnOrSuperColumn(other_element));
-      }
-      this.columns = __this__columns;
-    }
-  }
-
-  public KeySlice deepCopy() {
-    return new KeySlice(this);
-  }
-
-  @Override
-  public void clear() {
-    this.key = null;
-    this.columns = null;
-  }
-
-  public byte[] getKey() {
-    setKey(org.apache.thrift.TBaseHelper.rightSize(key));
-    return key == null ? null : key.array();
-  }
-
-  public ByteBuffer bufferForKey() {
-    return key;
-  }
-
-  public KeySlice setKey(byte[] key) {
-    setKey(key == null ? (ByteBuffer)null : ByteBuffer.wrap(key));
-    return this;
-  }
-
-  public KeySlice setKey(ByteBuffer key) {
-    this.key = key;
-    return this;
-  }
-
-  public void unsetKey() {
-    this.key = null;
-  }
-
-  /** Returns true if field key is set (has been assigned a value) and false 
otherwise */
-  public boolean isSetKey() {
-    return this.key != null;
-  }
-
-  public void setKeyIsSet(boolean value) {
-    if (!value) {
-      this.key = null;
-    }
-  }
-
-  public int getColumnsSize() {
-    return (this.columns == null) ? 0 : this.columns.size();
-  }
-
-  public java.util.Iterator<ColumnOrSuperColumn> getColumnsIterator() {
-    return (this.columns == null) ? null : this.columns.iterator();
-  }
-
-  public void addToColumns(ColumnOrSuperColumn elem) {
-    if (this.columns == null) {
-      this.columns = new ArrayList<ColumnOrSuperColumn>();
-    }
-    this.columns.add(elem);
-  }
-
-  public List<ColumnOrSuperColumn> getColumns() {
-    return this.columns;
-  }
-
-  public KeySlice setColumns(List<ColumnOrSuperColumn> columns) {
-    this.columns = columns;
-    return this;
-  }
-
-  public void unsetColumns() {
-    this.columns = null;
-  }
-
-  /** Returns true if field columns is set (has been assigned a value) and 
false otherwise */
-  public boolean isSetColumns() {
-    return this.columns != null;
-  }
-
-  public void setColumnsIsSet(boolean value) {
-    if (!value) {
-      this.columns = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case KEY:
-      if (value == null) {
-        unsetKey();
-      } else {
-        setKey((ByteBuffer)value);
-      }
-      break;
-
-    case COLUMNS:
-      if (value == null) {
-        unsetColumns();
-      } else {
-        setColumns((List<ColumnOrSuperColumn>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case KEY:
-      return getKey();
-
-    case COLUMNS:
-      return getColumns();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned 
a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case KEY:
-      return isSetKey();
-    case COLUMNS:
-      return isSetColumns();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof KeySlice)
-      return this.equals((KeySlice)that);
-    return false;
-  }
-
-  public boolean equals(KeySlice that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_key = true && this.isSetKey();
-    boolean that_present_key = true && that.isSetKey();
-    if (this_present_key || that_present_key) {
-      if (!(this_present_key && that_present_key))
-        return false;
-      if (!this.key.equals(that.key))
-        return false;
-    }
-
-    boolean this_present_columns = true && this.isSetColumns();
-    boolean that_present_columns = true && that.isSetColumns();
-    if (this_present_columns || that_present_columns) {
-      if (!(this_present_columns && that_present_columns))
-        return false;
-      if (!this.columns.equals(that.columns))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
-
-    boolean present_key = true && (isSetKey());
-    builder.append(present_key);
-    if (present_key)
-      builder.append(key);
-
-    boolean present_columns = true && (isSetColumns());
-    builder.append(present_columns);
-    if (present_columns)
-      builder.append(columns);
-
-    return builder.toHashCode();
-  }
-
-  @Override
-  public int compareTo(KeySlice other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetKey()).compareTo(other.isSetKey());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetKey()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, 
other.key);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = 
Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetColumns()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, 
other.columns);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("KeySlice(");
-    boolean first = true;
-
-    sb.append("key:");
-    if (this.key == null) {
-      sb.append("null");
-    } else {
-      org.apache.thrift.TBaseHelper.toString(this.key, sb);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("columns:");
-    if (this.columns == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.columns);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (key == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 
'key' was not present! Struct: " + toString());
-    }
-    if (columns == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 
'columns' was not present! Struct: " + toString());
-    }
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws 
java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws 
java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class KeySliceStandardSchemeFactory implements SchemeFactory {
-    public KeySliceStandardScheme getScheme() {
-      return new KeySliceStandardScheme();
-    }
-  }
-
-  private static class KeySliceStandardScheme extends StandardScheme<KeySlice> 
{
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, KeySlice 
struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // KEY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.key = iprot.readBinary();
-              struct.setKeyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          case 2: // COLUMNS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list40 = 
iprot.readListBegin();
-                struct.columns = new 
ArrayList<ColumnOrSuperColumn>(_list40.size);
-                for (int _i41 = 0; _i41 < _list40.size; ++_i41)
-                {
-                  ColumnOrSuperColumn _elem42;
-                  _elem42 = new ColumnOrSuperColumn();
-                  _elem42.read(iprot);
-                  struct.columns.add(_elem42);
-                }
-                iprot.readListEnd();
-              }
-              struct.setColumnsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-
-      // check for required fields of primitive type, which can't be checked 
in the validate method
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, KeySlice 
struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.key != null) {
-        oprot.writeFieldBegin(KEY_FIELD_DESC);
-        oprot.writeBinary(struct.key);
-        oprot.writeFieldEnd();
-      }
-      if (struct.columns != null) {
-        oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
-        {
-          oprot.writeListBegin(new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
struct.columns.size()));
-          for (ColumnOrSuperColumn _iter43 : struct.columns)
-          {
-            _iter43.write(oprot);
-          }
-          oprot.writeListEnd();
-        }
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class KeySliceTupleSchemeFactory implements SchemeFactory {
-    public KeySliceTupleScheme getScheme() {
-      return new KeySliceTupleScheme();
-    }
-  }
-
-  private static class KeySliceTupleScheme extends TupleScheme<KeySlice> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, KeySlice 
struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeBinary(struct.key);
-      {
-        oprot.writeI32(struct.columns.size());
-        for (ColumnOrSuperColumn _iter44 : struct.columns)
-        {
-          _iter44.write(oprot);
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, KeySlice 
struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.key = iprot.readBinary();
-      struct.setKeyIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list45 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
iprot.readI32());
-        struct.columns = new ArrayList<ColumnOrSuperColumn>(_list45.size);
-        for (int _i46 = 0; _i46 < _list45.size; ++_i46)
-        {
-          ColumnOrSuperColumn _elem47;
-          _elem47 = new ColumnOrSuperColumn();
-          _elem47.read(iprot);
-          struct.columns.add(_elem47);
-        }
-      }
-      struct.setColumnsIsSet(true);
-    }
-  }
-
-}
-

Reply via email to