cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [3/6] Upgrade Thrift to 0.9.1
Date Thu, 29 Aug 2013 23:57:47 GMT
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlPreparedResult.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlPreparedResult.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlPreparedResult.java
index 3c03d1f..b720a2d 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlPreparedResult.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlPreparedResult.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
  */
 
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+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;
@@ -37,6 +37,8 @@ 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;
@@ -52,7 +54,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class CqlPreparedResult implements org.apache.thrift.TBase<CqlPreparedResult, CqlPreparedResult._Fields>, java.io.Serializable, Cloneable {
+public class CqlPreparedResult implements org.apache.thrift.TBase<CqlPreparedResult, CqlPreparedResult._Fields>, java.io.Serializable, Cloneable, Comparable<CqlPreparedResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CqlPreparedResult");
 
   private static final org.apache.thrift.protocol.TField ITEM_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("itemId", org.apache.thrift.protocol.TType.I32, (short)1);
@@ -182,17 +184,11 @@ public class CqlPreparedResult implements org.apache.thrift.TBase<CqlPreparedRes
     this.itemId = other.itemId;
     this.count = other.count;
     if (other.isSetVariable_types()) {
-      List<String> __this__variable_types = new ArrayList<String>();
-      for (String other_element : other.variable_types) {
-        __this__variable_types.add(other_element);
-      }
+      List<String> __this__variable_types = new ArrayList<String>(other.variable_types);
       this.variable_types = __this__variable_types;
     }
     if (other.isSetVariable_names()) {
-      List<String> __this__variable_names = new ArrayList<String>();
-      for (String other_element : other.variable_names) {
-        __this__variable_names.add(other_element);
-      }
+      List<String> __this__variable_names = new ArrayList<String>(other.variable_names);
       this.variable_names = __this__variable_names;
     }
   }
@@ -488,50 +484,50 @@ public class CqlPreparedResult implements org.apache.thrift.TBase<CqlPreparedRes
     return builder.toHashCode();
   }
 
+  @Override
   public int compareTo(CqlPreparedResult other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    CqlPreparedResult typedOther = (CqlPreparedResult)other;
 
-    lastComparison = Boolean.valueOf(isSetItemId()).compareTo(typedOther.isSetItemId());
+    lastComparison = Boolean.valueOf(isSetItemId()).compareTo(other.isSetItemId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetItemId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.itemId, typedOther.itemId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.itemId, other.itemId);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCount()).compareTo(typedOther.isSetCount());
+    lastComparison = Boolean.valueOf(isSetCount()).compareTo(other.isSetCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetCount()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, typedOther.count);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, other.count);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetVariable_types()).compareTo(typedOther.isSetVariable_types());
+    lastComparison = Boolean.valueOf(isSetVariable_types()).compareTo(other.isSetVariable_types());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetVariable_types()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.variable_types, typedOther.variable_types);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.variable_types, other.variable_types);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetVariable_names()).compareTo(typedOther.isSetVariable_names());
+    lastComparison = Boolean.valueOf(isSetVariable_names()).compareTo(other.isSetVariable_names());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetVariable_names()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.variable_names, typedOther.variable_names);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.variable_names, other.variable_names);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -653,7 +649,7 @@ public class CqlPreparedResult implements org.apache.thrift.TBase<CqlPreparedRes
                 struct.variable_types = new ArrayList<String>(_list200.size);
                 for (int _i201 = 0; _i201 < _list200.size; ++_i201)
                 {
-                  String _elem202; // required
+                  String _elem202;
                   _elem202 = iprot.readString();
                   struct.variable_types.add(_elem202);
                 }
@@ -671,7 +667,7 @@ public class CqlPreparedResult implements org.apache.thrift.TBase<CqlPreparedRes
                 struct.variable_names = new ArrayList<String>(_list203.size);
                 for (int _i204 = 0; _i204 < _list203.size; ++_i204)
                 {
-                  String _elem205; // required
+                  String _elem205;
                   _elem205 = iprot.readString();
                   struct.variable_names.add(_elem205);
                 }
@@ -798,7 +794,7 @@ public class CqlPreparedResult implements org.apache.thrift.TBase<CqlPreparedRes
           struct.variable_types = new ArrayList<String>(_list210.size);
           for (int _i211 = 0; _i211 < _list210.size; ++_i211)
           {
-            String _elem212; // required
+            String _elem212;
             _elem212 = iprot.readString();
             struct.variable_types.add(_elem212);
           }
@@ -811,7 +807,7 @@ public class CqlPreparedResult implements org.apache.thrift.TBase<CqlPreparedRes
           struct.variable_names = new ArrayList<String>(_list213.size);
           for (int _i214 = 0; _i214 < _list213.size; ++_i214)
           {
-            String _elem215; // required
+            String _elem215;
             _elem215 = iprot.readString();
             struct.variable_names.add(_elem215);
           }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
index 86bca20..1cdbe07 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
  */
 
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+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;
@@ -37,6 +37,8 @@ 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;
@@ -52,7 +54,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class CqlResult implements org.apache.thrift.TBase<CqlResult, CqlResult._Fields>, java.io.Serializable, Cloneable {
+public class CqlResult implements org.apache.thrift.TBase<CqlResult, CqlResult._Fields>, java.io.Serializable, Cloneable, Comparable<CqlResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CqlResult");
 
   private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)1);
@@ -185,7 +187,7 @@ public class CqlResult implements org.apache.thrift.TBase<CqlResult, CqlResult._
       this.type = other.type;
     }
     if (other.isSetRows()) {
-      List<CqlRow> __this__rows = new ArrayList<CqlRow>();
+      List<CqlRow> __this__rows = new ArrayList<CqlRow>(other.rows.size());
       for (CqlRow other_element : other.rows) {
         __this__rows.add(new CqlRow(other_element));
       }
@@ -481,50 +483,50 @@ public class CqlResult implements org.apache.thrift.TBase<CqlResult, CqlResult._
     return builder.toHashCode();
   }
 
+  @Override
   public int compareTo(CqlResult other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    CqlResult typedOther = (CqlResult)other;
 
-    lastComparison = Boolean.valueOf(isSetType()).compareTo(typedOther.isSetType());
+    lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, typedOther.type);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, other.type);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRows()).compareTo(typedOther.isSetRows());
+    lastComparison = Boolean.valueOf(isSetRows()).compareTo(other.isSetRows());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetRows()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rows, typedOther.rows);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rows, other.rows);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetNum()).compareTo(typedOther.isSetNum());
+    lastComparison = Boolean.valueOf(isSetNum()).compareTo(other.isSetNum());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetNum()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num, typedOther.num);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num, other.num);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSchema()).compareTo(typedOther.isSetSchema());
+    lastComparison = Boolean.valueOf(isSetSchema()).compareTo(other.isSetSchema());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSchema()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.schema, typedOther.schema);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.schema, other.schema);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -648,7 +650,7 @@ public class CqlResult implements org.apache.thrift.TBase<CqlResult, CqlResult._
                 struct.rows = new ArrayList<CqlRow>(_list192.size);
                 for (int _i193 = 0; _i193 < _list192.size; ++_i193)
                 {
-                  CqlRow _elem194; // required
+                  CqlRow _elem194;
                   _elem194 = new CqlRow();
                   _elem194.read(iprot);
                   struct.rows.add(_elem194);
@@ -781,7 +783,7 @@ public class CqlResult implements org.apache.thrift.TBase<CqlResult, CqlResult._
           struct.rows = new ArrayList<CqlRow>(_list197.size);
           for (int _i198 = 0; _i198 < _list197.size; ++_i198)
           {
-            CqlRow _elem199; // required
+            CqlRow _elem199;
             _elem199 = new CqlRow();
             _elem199.read(iprot);
             struct.rows.add(_elem199);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java
index 524d67b..2928f68 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
index fd781ef..bc0cf77 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
  */
 
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+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;
@@ -37,6 +37,8 @@ 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;
@@ -55,7 +57,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Row returned from a CQL query
  */
-public class CqlRow implements org.apache.thrift.TBase<CqlRow, CqlRow._Fields>, java.io.Serializable, Cloneable {
+public class CqlRow implements org.apache.thrift.TBase<CqlRow, CqlRow._Fields>, java.io.Serializable, Cloneable, Comparable<CqlRow> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CqlRow");
 
   private static final org.apache.thrift.protocol.TField KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("key", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -165,7 +167,7 @@ public class CqlRow implements org.apache.thrift.TBase<CqlRow, CqlRow._Fields>,
 ;
     }
     if (other.isSetColumns()) {
-      List<Column> __this__columns = new ArrayList<Column>();
+      List<Column> __this__columns = new ArrayList<Column>(other.columns.size());
       for (Column other_element : other.columns) {
         __this__columns.add(new Column(other_element));
       }
@@ -355,30 +357,30 @@ public class CqlRow implements org.apache.thrift.TBase<CqlRow, CqlRow._Fields>,
     return builder.toHashCode();
   }
 
+  @Override
   public int compareTo(CqlRow other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    CqlRow typedOther = (CqlRow)other;
 
-    lastComparison = Boolean.valueOf(isSetKey()).compareTo(typedOther.isSetKey());
+    lastComparison = Boolean.valueOf(isSetKey()).compareTo(other.isSetKey());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetKey()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, typedOther.key);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, other.key);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns());
+    lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetColumns()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -482,7 +484,7 @@ public class CqlRow implements org.apache.thrift.TBase<CqlRow, CqlRow._Fields>,
                 struct.columns = new ArrayList<Column>(_list164.size);
                 for (int _i165 = 0; _i165 < _list164.size; ++_i165)
                 {
-                  Column _elem166; // required
+                  Column _elem166;
                   _elem166 = new Column();
                   _elem166.read(iprot);
                   struct.columns.add(_elem166);
@@ -563,7 +565,7 @@ public class CqlRow implements org.apache.thrift.TBase<CqlRow, CqlRow._Fields>,
         struct.columns = new ArrayList<Column>(_list169.size);
         for (int _i170 = 0; _i170 < _list169.size; ++_i170)
         {
-          Column _elem171; // required
+          Column _elem171;
           _elem171 = new Column();
           _elem171.read(iprot);
           struct.columns.add(_elem171);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java
index c98aab6..c98e449 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
  */
 
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+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;
@@ -37,6 +37,8 @@ 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;
@@ -55,7 +57,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Note that the timestamp is only optional in case of counter deletion.
  */
-public class Deletion implements org.apache.thrift.TBase<Deletion, Deletion._Fields>, java.io.Serializable, Cloneable {
+public class Deletion implements org.apache.thrift.TBase<Deletion, Deletion._Fields>, java.io.Serializable, Cloneable, Comparable<Deletion> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Deletion");
 
   private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)1);
@@ -390,40 +392,40 @@ public class Deletion implements org.apache.thrift.TBase<Deletion, Deletion._Fie
     return builder.toHashCode();
   }
 
+  @Override
   public int compareTo(Deletion other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    Deletion typedOther = (Deletion)other;
 
-    lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp());
+    lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTimestamp()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, other.timestamp);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSuper_column()).compareTo(typedOther.isSetSuper_column());
+    lastComparison = Boolean.valueOf(isSetSuper_column()).compareTo(other.isSetSuper_column());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSuper_column()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.super_column, typedOther.super_column);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.super_column, other.super_column);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPredicate()).compareTo(typedOther.isSetPredicate());
+    lastComparison = Boolean.valueOf(isSetPredicate()).compareTo(other.isSetPredicate());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPredicate()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.predicate, typedOther.predicate);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.predicate, other.predicate);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/interface/thrift/gen-java/org/apache/cassandra/thrift/EndpointDetails.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/EndpointDetails.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/EndpointDetails.java
index 7654e9e..69fcf58 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/EndpointDetails.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/EndpointDetails.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
  */
 
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+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;
@@ -37,6 +37,8 @@ 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;
@@ -52,7 +54,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class EndpointDetails implements org.apache.thrift.TBase<EndpointDetails, EndpointDetails._Fields>, java.io.Serializable, Cloneable {
+public class EndpointDetails implements org.apache.thrift.TBase<EndpointDetails, EndpointDetails._Fields>, java.io.Serializable, Cloneable, Comparable<EndpointDetails> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EndpointDetails");
 
   private static final org.apache.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("host", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -384,40 +386,40 @@ public class EndpointDetails implements org.apache.thrift.TBase<EndpointDetails,
     return builder.toHashCode();
   }
 
+  @Override
   public int compareTo(EndpointDetails other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    EndpointDetails typedOther = (EndpointDetails)other;
 
-    lastComparison = Boolean.valueOf(isSetHost()).compareTo(typedOther.isSetHost());
+    lastComparison = Boolean.valueOf(isSetHost()).compareTo(other.isSetHost());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetHost()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, typedOther.host);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, other.host);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDatacenter()).compareTo(typedOther.isSetDatacenter());
+    lastComparison = Boolean.valueOf(isSetDatacenter()).compareTo(other.isSetDatacenter());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetDatacenter()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.datacenter, typedOther.datacenter);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.datacenter, other.datacenter);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRack()).compareTo(typedOther.isSetRack());
+    lastComparison = Boolean.valueOf(isSetRack()).compareTo(other.isSetRack());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetRack()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rack, typedOther.rack);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rack, other.rack);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java
index 499a081..f3524b5 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
  */
 
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+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;
@@ -37,6 +37,8 @@ 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;
@@ -55,7 +57,7 @@ import org.slf4j.LoggerFactory;
 /**
  * @deprecated use a KeyRange with row_filter in get_range_slices instead
  */
-public class IndexClause implements org.apache.thrift.TBase<IndexClause, IndexClause._Fields>, java.io.Serializable, Cloneable {
+public class IndexClause implements org.apache.thrift.TBase<IndexClause, IndexClause._Fields>, java.io.Serializable, Cloneable, Comparable<IndexClause> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IndexClause");
 
   private static final org.apache.thrift.protocol.TField EXPRESSIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("expressions", org.apache.thrift.protocol.TType.LIST, (short)1);
@@ -176,7 +178,7 @@ public class IndexClause implements org.apache.thrift.TBase<IndexClause, IndexCl
   public IndexClause(IndexClause other) {
     __isset_bitfield = other.__isset_bitfield;
     if (other.isSetExpressions()) {
-      List<IndexExpression> __this__expressions = new ArrayList<IndexExpression>();
+      List<IndexExpression> __this__expressions = new ArrayList<IndexExpression>(other.expressions.size());
       for (IndexExpression other_element : other.expressions) {
         __this__expressions.add(new IndexExpression(other_element));
       }
@@ -423,40 +425,40 @@ public class IndexClause implements org.apache.thrift.TBase<IndexClause, IndexCl
     return builder.toHashCode();
   }
 
+  @Override
   public int compareTo(IndexClause other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    IndexClause typedOther = (IndexClause)other;
 
-    lastComparison = Boolean.valueOf(isSetExpressions()).compareTo(typedOther.isSetExpressions());
+    lastComparison = Boolean.valueOf(isSetExpressions()).compareTo(other.isSetExpressions());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetExpressions()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.expressions, typedOther.expressions);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.expressions, other.expressions);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStart_key()).compareTo(typedOther.isSetStart_key());
+    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, typedOther.start_key);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start_key, other.start_key);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCount()).compareTo(typedOther.isSetCount());
+    lastComparison = Boolean.valueOf(isSetCount()).compareTo(other.isSetCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetCount()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, typedOther.count);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, other.count);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -559,7 +561,7 @@ public class IndexClause implements org.apache.thrift.TBase<IndexClause, IndexCl
                 struct.expressions = new ArrayList<IndexExpression>(_list24.size);
                 for (int _i25 = 0; _i25 < _list24.size; ++_i25)
                 {
-                  IndexExpression _elem26; // required
+                  IndexExpression _elem26;
                   _elem26 = new IndexExpression();
                   _elem26.read(iprot);
                   struct.expressions.add(_elem26);
@@ -661,7 +663,7 @@ public class IndexClause implements org.apache.thrift.TBase<IndexClause, IndexCl
         struct.expressions = new ArrayList<IndexExpression>(_list29.size);
         for (int _i30 = 0; _i30 < _list29.size; ++_i30)
         {
-          IndexExpression _elem31; // required
+          IndexExpression _elem31;
           _elem31 = new IndexExpression();
           _elem31.read(iprot);
           struct.expressions.add(_elem31);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java
index 0622fd4..5062f2f 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
  */
 
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+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;
@@ -37,6 +37,8 @@ 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;
@@ -52,7 +54,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class IndexExpression implements org.apache.thrift.TBase<IndexExpression, IndexExpression._Fields>, java.io.Serializable, Cloneable {
+public class IndexExpression implements org.apache.thrift.TBase<IndexExpression, IndexExpression._Fields>, java.io.Serializable, Cloneable, Comparable<IndexExpression> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IndexExpression");
 
   private static final org.apache.thrift.protocol.TField COLUMN_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("column_name", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -423,40 +425,40 @@ public class IndexExpression implements org.apache.thrift.TBase<IndexExpression,
     return builder.toHashCode();
   }
 
+  @Override
   public int compareTo(IndexExpression other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    IndexExpression typedOther = (IndexExpression)other;
 
-    lastComparison = Boolean.valueOf(isSetColumn_name()).compareTo(typedOther.isSetColumn_name());
+    lastComparison = Boolean.valueOf(isSetColumn_name()).compareTo(other.isSetColumn_name());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetColumn_name()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_name, typedOther.column_name);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_name, other.column_name);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOp()).compareTo(typedOther.isSetOp());
+    lastComparison = Boolean.valueOf(isSetOp()).compareTo(other.isSetOp());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOp()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.op, typedOther.op);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.op, other.op);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetValue()).compareTo(typedOther.isSetValue());
+    lastComparison = Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetValue()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, typedOther.value);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexOperator.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexOperator.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexOperator.java
index a35e089..767d773 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexOperator.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexOperator.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/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
index 6bdf7db..e6a5e9b 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexType.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/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
index 1344ba6..6038a23 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
  */
 
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+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;
@@ -37,6 +37,8 @@ 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;
@@ -56,7 +58,7 @@ 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 {
+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);
@@ -261,20 +263,20 @@ public class InvalidRequestException extends TException implements org.apache.th
     return builder.toHashCode();
   }
 
+  @Override
   public int compareTo(InvalidRequestException other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    InvalidRequestException typedOther = (InvalidRequestException)other;
 
-    lastComparison = Boolean.valueOf(isSetWhy()).compareTo(typedOther.isSetWhy());
+    lastComparison = Boolean.valueOf(isSetWhy()).compareTo(other.isSetWhy());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetWhy()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.why, typedOther.why);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.why, other.why);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/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
index 54c7656..cbb5e51 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyCount.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyCount.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
  */
 
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+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;
@@ -37,6 +37,8 @@ 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;
@@ -52,7 +54,7 @@ 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 {
+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);
@@ -334,30 +336,30 @@ public class KeyCount implements org.apache.thrift.TBase<KeyCount, KeyCount._Fie
     return builder.toHashCode();
   }
 
+  @Override
   public int compareTo(KeyCount other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    KeyCount typedOther = (KeyCount)other;
 
-    lastComparison = Boolean.valueOf(isSetKey()).compareTo(typedOther.isSetKey());
+    lastComparison = Boolean.valueOf(isSetKey()).compareTo(other.isSetKey());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetKey()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, typedOther.key);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, other.key);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCount()).compareTo(typedOther.isSetCount());
+    lastComparison = Boolean.valueOf(isSetCount()).compareTo(other.isSetCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetCount()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, typedOther.count);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, other.count);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/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
index 243327d..0168410 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
  */
 
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+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;
@@ -37,6 +37,8 @@ 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;
@@ -60,7 +62,7 @@ import org.slf4j.LoggerFactory;
  * 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 {
+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);
@@ -213,7 +215,7 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
       this.end_token = other.end_token;
     }
     if (other.isSetRow_filter()) {
-      List<IndexExpression> __this__row_filter = new ArrayList<IndexExpression>();
+      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));
       }
@@ -622,70 +624,70 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
     return builder.toHashCode();
   }
 
+  @Override
   public int compareTo(KeyRange other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    KeyRange typedOther = (KeyRange)other;
 
-    lastComparison = Boolean.valueOf(isSetStart_key()).compareTo(typedOther.isSetStart_key());
+    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, typedOther.start_key);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start_key, other.start_key);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetEnd_key()).compareTo(typedOther.isSetEnd_key());
+    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, typedOther.end_key);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.end_key, other.end_key);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStart_token()).compareTo(typedOther.isSetStart_token());
+    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, typedOther.start_token);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start_token, other.start_token);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetEnd_token()).compareTo(typedOther.isSetEnd_token());
+    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, typedOther.end_token);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.end_token, other.end_token);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRow_filter()).compareTo(typedOther.isSetRow_filter());
+    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, typedOther.row_filter);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row_filter, other.row_filter);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCount()).compareTo(typedOther.isSetCount());
+    lastComparison = Boolean.valueOf(isSetCount()).compareTo(other.isSetCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetCount()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, typedOther.count);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, other.count);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -848,7 +850,7 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
                 struct.row_filter = new ArrayList<IndexExpression>(_list32.size);
                 for (int _i33 = 0; _i33 < _list32.size; ++_i33)
                 {
-                  IndexExpression _elem34; // required
+                  IndexExpression _elem34;
                   _elem34 = new IndexExpression();
                   _elem34.read(iprot);
                   struct.row_filter.add(_elem34);
@@ -1017,7 +1019,7 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
           struct.row_filter = new ArrayList<IndexExpression>(_list37.size);
           for (int _i38 = 0; _i38 < _list37.size; ++_i38)
           {
-            IndexExpression _elem39; // required
+            IndexExpression _elem39;
             _elem39 = new IndexExpression();
             _elem39.read(iprot);
             struct.row_filter.add(_elem39);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/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
index e7de670..df4beb1 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
  */
 
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+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;
@@ -37,6 +37,8 @@ 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;
@@ -59,7 +61,7 @@ import org.slf4j.LoggerFactory;
  * @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 {
+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);
@@ -169,7 +171,7 @@ public class KeySlice implements org.apache.thrift.TBase<KeySlice, KeySlice._Fie
 ;
     }
     if (other.isSetColumns()) {
-      List<ColumnOrSuperColumn> __this__columns = new ArrayList<ColumnOrSuperColumn>();
+      List<ColumnOrSuperColumn> __this__columns = new ArrayList<ColumnOrSuperColumn>(other.columns.size());
       for (ColumnOrSuperColumn other_element : other.columns) {
         __this__columns.add(new ColumnOrSuperColumn(other_element));
       }
@@ -359,30 +361,30 @@ public class KeySlice implements org.apache.thrift.TBase<KeySlice, KeySlice._Fie
     return builder.toHashCode();
   }
 
+  @Override
   public int compareTo(KeySlice other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    KeySlice typedOther = (KeySlice)other;
 
-    lastComparison = Boolean.valueOf(isSetKey()).compareTo(typedOther.isSetKey());
+    lastComparison = Boolean.valueOf(isSetKey()).compareTo(other.isSetKey());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetKey()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, typedOther.key);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, other.key);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns());
+    lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetColumns()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -486,7 +488,7 @@ public class KeySlice implements org.apache.thrift.TBase<KeySlice, KeySlice._Fie
                 struct.columns = new ArrayList<ColumnOrSuperColumn>(_list40.size);
                 for (int _i41 = 0; _i41 < _list40.size; ++_i41)
                 {
-                  ColumnOrSuperColumn _elem42; // required
+                  ColumnOrSuperColumn _elem42;
                   _elem42 = new ColumnOrSuperColumn();
                   _elem42.read(iprot);
                   struct.columns.add(_elem42);
@@ -567,7 +569,7 @@ public class KeySlice implements org.apache.thrift.TBase<KeySlice, KeySlice._Fie
         struct.columns = new ArrayList<ColumnOrSuperColumn>(_list45.size);
         for (int _i46 = 0; _i46 < _list45.size; ++_i46)
         {
-          ColumnOrSuperColumn _elem47; // required
+          ColumnOrSuperColumn _elem47;
           _elem47 = new ColumnOrSuperColumn();
           _elem47.read(iprot);
           struct.columns.add(_elem47);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
index dbc4d13..cd2a938 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
  */
 
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+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;
@@ -37,6 +37,8 @@ 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;
@@ -52,7 +54,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, java.io.Serializable, Cloneable {
+public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, java.io.Serializable, Cloneable, Comparable<KsDef> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KsDef");
 
   private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -209,23 +211,12 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
       this.strategy_class = other.strategy_class;
     }
     if (other.isSetStrategy_options()) {
-      Map<String,String> __this__strategy_options = new HashMap<String,String>();
-      for (Map.Entry<String, String> other_element : other.strategy_options.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        String other_element_value = other_element.getValue();
-
-        String __this__strategy_options_copy_key = other_element_key;
-
-        String __this__strategy_options_copy_value = other_element_value;
-
-        __this__strategy_options.put(__this__strategy_options_copy_key, __this__strategy_options_copy_value);
-      }
+      Map<String,String> __this__strategy_options = new HashMap<String,String>(other.strategy_options);
       this.strategy_options = __this__strategy_options;
     }
     this.replication_factor = other.replication_factor;
     if (other.isSetCf_defs()) {
-      List<CfDef> __this__cf_defs = new ArrayList<CfDef>();
+      List<CfDef> __this__cf_defs = new ArrayList<CfDef>(other.cf_defs.size());
       for (CfDef other_element : other.cf_defs) {
         __this__cf_defs.add(new CfDef(other_element));
       }
@@ -631,70 +622,70 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
     return builder.toHashCode();
   }
 
+  @Override
   public int compareTo(KsDef other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    KsDef typedOther = (KsDef)other;
 
-    lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName());
+    lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStrategy_class()).compareTo(typedOther.isSetStrategy_class());
+    lastComparison = Boolean.valueOf(isSetStrategy_class()).compareTo(other.isSetStrategy_class());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStrategy_class()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.strategy_class, typedOther.strategy_class);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.strategy_class, other.strategy_class);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStrategy_options()).compareTo(typedOther.isSetStrategy_options());
+    lastComparison = Boolean.valueOf(isSetStrategy_options()).compareTo(other.isSetStrategy_options());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStrategy_options()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.strategy_options, typedOther.strategy_options);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.strategy_options, other.strategy_options);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetReplication_factor()).compareTo(typedOther.isSetReplication_factor());
+    lastComparison = Boolean.valueOf(isSetReplication_factor()).compareTo(other.isSetReplication_factor());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetReplication_factor()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.replication_factor, typedOther.replication_factor);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.replication_factor, other.replication_factor);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCf_defs()).compareTo(typedOther.isSetCf_defs());
+    lastComparison = Boolean.valueOf(isSetCf_defs()).compareTo(other.isSetCf_defs());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetCf_defs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cf_defs, typedOther.cf_defs);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cf_defs, other.cf_defs);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDurable_writes()).compareTo(typedOther.isSetDurable_writes());
+    lastComparison = Boolean.valueOf(isSetDurable_writes()).compareTo(other.isSetDurable_writes());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetDurable_writes()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.durable_writes, typedOther.durable_writes);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.durable_writes, other.durable_writes);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -841,8 +832,8 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
                 struct.strategy_options = new HashMap<String,String>(2*_map146.size);
                 for (int _i147 = 0; _i147 < _map146.size; ++_i147)
                 {
-                  String _key148; // required
-                  String _val149; // required
+                  String _key148;
+                  String _val149;
                   _key148 = iprot.readString();
                   _val149 = iprot.readString();
                   struct.strategy_options.put(_key148, _val149);
@@ -869,7 +860,7 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
                 struct.cf_defs = new ArrayList<CfDef>(_list150.size);
                 for (int _i151 = 0; _i151 < _list150.size; ++_i151)
                 {
-                  CfDef _elem152; // required
+                  CfDef _elem152;
                   _elem152 = new CfDef();
                   _elem152.read(iprot);
                   struct.cf_defs.add(_elem152);
@@ -1018,7 +1009,7 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
         struct.cf_defs = new ArrayList<CfDef>(_list157.size);
         for (int _i158 = 0; _i158 < _list157.size; ++_i158)
         {
-          CfDef _elem159; // required
+          CfDef _elem159;
           _elem159 = new CfDef();
           _elem159.read(iprot);
           struct.cf_defs.add(_elem159);
@@ -1032,8 +1023,8 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
           struct.strategy_options = new HashMap<String,String>(2*_map160.size);
           for (int _i161 = 0; _i161 < _map160.size; ++_i161)
           {
-            String _key162; // required
-            String _val163; // required
+            String _key162;
+            String _val163;
             _key162 = iprot.readString();
             _val163 = iprot.readString();
             struct.strategy_options.put(_key162, _val163);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/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
index 0076e11..981d5a4 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
  */
 
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+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;
@@ -37,6 +37,8 @@ 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;
@@ -57,7 +59,7 @@ import org.slf4j.LoggerFactory;
  * @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 {
+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);
@@ -318,30 +320,30 @@ public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fie
     return builder.toHashCode();
   }
 
+  @Override
   public int compareTo(Mutation other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    Mutation typedOther = (Mutation)other;
 
-    lastComparison = Boolean.valueOf(isSetColumn_or_supercolumn()).compareTo(typedOther.isSetColumn_or_supercolumn());
+    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, typedOther.column_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(typedOther.isSetDeletion());
+    lastComparison = Boolean.valueOf(isSetDeletion()).compareTo(other.isSetDeletion());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetDeletion()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.deletion, typedOther.deletion);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.deletion, other.deletion);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/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
index 02d1c26..0bd8cee 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
  */
 
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+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;
@@ -37,6 +37,8 @@ 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;
@@ -55,7 +57,7 @@ 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 {
+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");
 
 
@@ -190,13 +192,13 @@ public class NotFoundException extends TException implements org.apache.thrift.T
     return builder.toHashCode();
   }
 
+  @Override
   public int compareTo(NotFoundException other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    NotFoundException typedOther = (NotFoundException)other;
 
     return 0;
   }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/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
index 2f498a6..003b822 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
  */
 
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+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;
@@ -37,6 +37,8 @@ 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;
@@ -58,7 +60,7 @@ import org.slf4j.LoggerFactory;
  * 
  * 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 {
+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");
 
 
@@ -193,13 +195,13 @@ public class SchemaDisagreementException extends TException implements org.apach
     return builder.toHashCode();
   }
 
+  @Override
   public int compareTo(SchemaDisagreementException other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    SchemaDisagreementException typedOther = (SchemaDisagreementException)other;
 
     return 0;
   }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/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
index 0624e93..9d46680 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
  */
 
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+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;
@@ -37,6 +37,8 @@ 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;
@@ -64,7 +66,7 @@ import org.slf4j.LoggerFactory;
  *                     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 {
+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);
@@ -162,12 +164,7 @@ public class SlicePredicate implements org.apache.thrift.TBase<SlicePredicate, S
    */
   public SlicePredicate(SlicePredicate other) {
     if (other.isSetColumn_names()) {
-      List<ByteBuffer> __this__column_names = new ArrayList<ByteBuffer>();
-      for (ByteBuffer other_element : other.column_names) {
-        ByteBuffer temp_binary_element = org.apache.thrift.TBaseHelper.copyBinary(other_element);
-;
-        __this__column_names.add(temp_binary_element);
-      }
+      List<ByteBuffer> __this__column_names = new ArrayList<ByteBuffer>(other.column_names);
       this.column_names = __this__column_names;
     }
     if (other.isSetSlice_range()) {
@@ -347,30 +344,30 @@ public class SlicePredicate implements org.apache.thrift.TBase<SlicePredicate, S
     return builder.toHashCode();
   }
 
+  @Override
   public int compareTo(SlicePredicate other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    SlicePredicate typedOther = (SlicePredicate)other;
 
-    lastComparison = Boolean.valueOf(isSetColumn_names()).compareTo(typedOther.isSetColumn_names());
+    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, typedOther.column_names);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_names, other.column_names);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSlice_range()).compareTo(typedOther.isSetSlice_range());
+    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, typedOther.slice_range);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.slice_range, other.slice_range);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -467,7 +464,7 @@ public class SlicePredicate implements org.apache.thrift.TBase<SlicePredicate, S
                 struct.column_names = new ArrayList<ByteBuffer>(_list16.size);
                 for (int _i17 = 0; _i17 < _list16.size; ++_i17)
                 {
-                  ByteBuffer _elem18; // required
+                  ByteBuffer _elem18;
                   _elem18 = iprot.readBinary();
                   struct.column_names.add(_elem18);
                 }
@@ -572,7 +569,7 @@ public class SlicePredicate implements org.apache.thrift.TBase<SlicePredicate, S
           struct.column_names = new ArrayList<ByteBuffer>(_list21.size);
           for (int _i22 = 0; _i22 < _list21.size; ++_i22)
           {
-            ByteBuffer _elem23; // required
+            ByteBuffer _elem23;
             _elem23 = iprot.readBinary();
             struct.column_names.add(_elem23);
           }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/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
index 543265c..4b96c86 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
  */
 
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+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;
@@ -37,6 +37,8 @@ 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;
@@ -68,7 +70,7 @@ import org.slf4j.LoggerFactory;
  *               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 {
+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);
@@ -493,50 +495,50 @@ public class SliceRange implements org.apache.thrift.TBase<SliceRange, SliceRang
     return builder.toHashCode();
   }
 
+  @Override
   public int compareTo(SliceRange other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    SliceRange typedOther = (SliceRange)other;
 
-    lastComparison = Boolean.valueOf(isSetStart()).compareTo(typedOther.isSetStart());
+    lastComparison = Boolean.valueOf(isSetStart()).compareTo(other.isSetStart());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStart()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start, typedOther.start);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start, other.start);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFinish()).compareTo(typedOther.isSetFinish());
+    lastComparison = Boolean.valueOf(isSetFinish()).compareTo(other.isSetFinish());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetFinish()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.finish, typedOther.finish);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.finish, other.finish);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetReversed()).compareTo(typedOther.isSetReversed());
+    lastComparison = Boolean.valueOf(isSetReversed()).compareTo(other.isSetReversed());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetReversed()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reversed, typedOther.reversed);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reversed, other.reversed);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCount()).compareTo(typedOther.isSetCount());
+    lastComparison = Boolean.valueOf(isSetCount()).compareTo(other.isSetCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetCount()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, typedOther.count);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, other.count);
       if (lastComparison != 0) {
         return lastComparison;
       }


Mime
View raw message