cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r942191 [2/3] - in /cassandra/trunk: ./ interface/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/thrift/ test/system/
Date Fri, 07 May 2010 19:45:31 GMT
Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java?rev=942191&r1=942190&r2=942191&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java Fri May  7 19:45:31 2010
@@ -107,19 +107,6 @@ public class Cassandra {
 
     /**
      * returns a subset of columns for a range of keys.
-     * @Deprecated.  Use get_range_slices instead
-     * 
-     * @param column_parent
-     * @param predicate
-     * @param start_key
-     * @param finish_key
-     * @param row_count
-     * @param consistency_level
-     */
-    public List<KeySlice> get_range_slice(ColumnParent column_parent, SlicePredicate predicate, byte[] start_key, byte[] finish_key, int row_count, ConsistencyLevel consistency_level) throws InvalidRequestException, UnavailableException, TimedOutException, TException;
-
-    /**
-     * returns a subset of columns for a range of keys.
      * 
      * @param column_parent
      * @param predicate
@@ -139,18 +126,6 @@ public class Cassandra {
     public void insert(byte[] key, ColumnParent column_parent, Column column, ConsistencyLevel consistency_level) throws InvalidRequestException, UnavailableException, TimedOutException, TException;
 
     /**
-     * Insert Columns or SuperColumns across different Column Families for the same row key. batch_mutation is a
-     * map<string, list<ColumnOrSuperColumn>> -- a map which pairs column family names with the relevant ColumnOrSuperColumn
-     * objects to insert.
-     * @deprecated; use batch_mutate instead
-     * 
-     * @param key
-     * @param cfmap
-     * @param consistency_level
-     */
-    public void batch_insert(byte[] key, Map<String,List<ColumnOrSuperColumn>> cfmap, ConsistencyLevel consistency_level) throws InvalidRequestException, UnavailableException, TimedOutException, TException;
-
-    /**
      * Remove data from the row specified by key at the granularity specified by column_path, and the given timestamp. Note
      * that all the values in column_path besides column_path.column_family are truly optional: you can remove the entire
      * row by just specifying the ColumnFamily, or you can remove a SuperColumn or a single Column by specifying those levels too.
@@ -563,53 +538,6 @@ public class Cassandra {
       throw new TApplicationException(TApplicationException.MISSING_RESULT, "multiget_count failed: unknown result");
     }
 
-    public List<KeySlice> get_range_slice(ColumnParent column_parent, SlicePredicate predicate, byte[] start_key, byte[] finish_key, int row_count, ConsistencyLevel consistency_level) throws InvalidRequestException, UnavailableException, TimedOutException, TException
-    {
-      send_get_range_slice(column_parent, predicate, start_key, finish_key, row_count, consistency_level);
-      return recv_get_range_slice();
-    }
-
-    public void send_get_range_slice(ColumnParent column_parent, SlicePredicate predicate, byte[] start_key, byte[] finish_key, int row_count, ConsistencyLevel consistency_level) throws TException
-    {
-      oprot_.writeMessageBegin(new TMessage("get_range_slice", TMessageType.CALL, seqid_));
-      get_range_slice_args args = new get_range_slice_args();
-      args.column_parent = column_parent;
-      args.predicate = predicate;
-      args.start_key = start_key;
-      args.finish_key = finish_key;
-      args.row_count = row_count;
-      args.consistency_level = consistency_level;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
-    }
-
-    public List<KeySlice> recv_get_range_slice() throws InvalidRequestException, UnavailableException, TimedOutException, TException
-    {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
-      get_range_slice_result result = new get_range_slice_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ue != null) {
-        throw result.ue;
-      }
-      if (result.te != null) {
-        throw result.te;
-      }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "get_range_slice failed: unknown result");
-    }
-
     public List<KeySlice> get_range_slices(ColumnParent column_parent, SlicePredicate predicate, KeyRange range, ConsistencyLevel consistency_level) throws InvalidRequestException, UnavailableException, TimedOutException, TException
     {
       send_get_range_slices(column_parent, predicate, range, consistency_level);
@@ -697,47 +625,6 @@ public class Cassandra {
       return;
     }
 
-    public void batch_insert(byte[] key, Map<String,List<ColumnOrSuperColumn>> cfmap, ConsistencyLevel consistency_level) throws InvalidRequestException, UnavailableException, TimedOutException, TException
-    {
-      send_batch_insert(key, cfmap, consistency_level);
-      recv_batch_insert();
-    }
-
-    public void send_batch_insert(byte[] key, Map<String,List<ColumnOrSuperColumn>> cfmap, ConsistencyLevel consistency_level) throws TException
-    {
-      oprot_.writeMessageBegin(new TMessage("batch_insert", TMessageType.CALL, seqid_));
-      batch_insert_args args = new batch_insert_args();
-      args.key = key;
-      args.cfmap = cfmap;
-      args.consistency_level = consistency_level;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
-    }
-
-    public void recv_batch_insert() throws InvalidRequestException, UnavailableException, TimedOutException, TException
-    {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
-      batch_insert_result result = new batch_insert_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      if (result.ue != null) {
-        throw result.ue;
-      }
-      if (result.te != null) {
-        throw result.te;
-      }
-      return;
-    }
-
     public void remove(byte[] key, ColumnPath column_path, long timestamp, ConsistencyLevel consistency_level) throws InvalidRequestException, UnavailableException, TimedOutException, TException
     {
       send_remove(key, column_path, timestamp, consistency_level);
@@ -1235,10 +1122,8 @@ public class Cassandra {
       processMap_.put("multiget_slice", new multiget_slice());
       processMap_.put("get_count", new get_count());
       processMap_.put("multiget_count", new multiget_count());
-      processMap_.put("get_range_slice", new get_range_slice());
       processMap_.put("get_range_slices", new get_range_slices());
       processMap_.put("insert", new insert());
-      processMap_.put("batch_insert", new batch_insert());
       processMap_.put("remove", new remove());
       processMap_.put("batch_mutate", new batch_mutate());
       processMap_.put("describe_keyspaces", new describe_keyspaces());
@@ -1571,48 +1456,6 @@ public class Cassandra {
 
     }
 
-    private class get_range_slice implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        get_range_slice_args args = new get_range_slice_args();
-        try {
-          args.read(iprot);
-        } catch (TProtocolException e) {
-          iprot.readMessageEnd();
-          TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage());
-          oprot.writeMessageBegin(new TMessage("get_range_slice", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        iprot.readMessageEnd();
-        get_range_slice_result result = new get_range_slice_result();
-        try {
-          result.success = iface_.get_range_slice(args.column_parent, args.predicate, args.start_key, args.finish_key, args.row_count, args.consistency_level);
-        } catch (InvalidRequestException ire) {
-          result.ire = ire;
-        } catch (UnavailableException ue) {
-          result.ue = ue;
-        } catch (TimedOutException te) {
-          result.te = te;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing get_range_slice", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing get_range_slice");
-          oprot.writeMessageBegin(new TMessage("get_range_slice", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        oprot.writeMessageBegin(new TMessage("get_range_slice", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
-      }
-
-    }
-
     private class get_range_slices implements ProcessFunction {
       public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
       {
@@ -1697,48 +1540,6 @@ public class Cassandra {
 
     }
 
-    private class batch_insert implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        batch_insert_args args = new batch_insert_args();
-        try {
-          args.read(iprot);
-        } catch (TProtocolException e) {
-          iprot.readMessageEnd();
-          TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage());
-          oprot.writeMessageBegin(new TMessage("batch_insert", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        iprot.readMessageEnd();
-        batch_insert_result result = new batch_insert_result();
-        try {
-          iface_.batch_insert(args.key, args.cfmap, args.consistency_level);
-        } catch (InvalidRequestException ire) {
-          result.ire = ire;
-        } catch (UnavailableException ue) {
-          result.ue = ue;
-        } catch (TimedOutException te) {
-          result.te = te;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing batch_insert", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing batch_insert");
-          oprot.writeMessageBegin(new TMessage("batch_insert", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        oprot.writeMessageBegin(new TMessage("batch_insert", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
-      }
-
-    }
-
     private class remove implements ProcessFunction {
       public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
       {
@@ -9270,21 +9071,17 @@ public class Cassandra {
 
   }
 
-  public static class get_range_slice_args implements TBase<get_range_slice_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_range_slice_args>   {
-    private static final TStruct STRUCT_DESC = new TStruct("get_range_slice_args");
+  public static class get_range_slices_args implements TBase<get_range_slices_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_range_slices_args>   {
+    private static final TStruct STRUCT_DESC = new TStruct("get_range_slices_args");
 
     private static final TField COLUMN_PARENT_FIELD_DESC = new TField("column_parent", TType.STRUCT, (short)1);
     private static final TField PREDICATE_FIELD_DESC = new TField("predicate", TType.STRUCT, (short)2);
-    private static final TField START_KEY_FIELD_DESC = new TField("start_key", TType.STRING, (short)3);
-    private static final TField FINISH_KEY_FIELD_DESC = new TField("finish_key", TType.STRING, (short)4);
-    private static final TField ROW_COUNT_FIELD_DESC = new TField("row_count", TType.I32, (short)5);
-    private static final TField CONSISTENCY_LEVEL_FIELD_DESC = new TField("consistency_level", TType.I32, (short)6);
+    private static final TField RANGE_FIELD_DESC = new TField("range", TType.STRUCT, (short)3);
+    private static final TField CONSISTENCY_LEVEL_FIELD_DESC = new TField("consistency_level", TType.I32, (short)4);
 
     public ColumnParent column_parent;
     public SlicePredicate predicate;
-    public byte[] start_key;
-    public byte[] finish_key;
-    public int row_count;
+    public KeyRange range;
     /**
      * 
      * @see ConsistencyLevel
@@ -9295,14 +9092,12 @@ public class Cassandra {
     public enum _Fields implements TFieldIdEnum {
       COLUMN_PARENT((short)1, "column_parent"),
       PREDICATE((short)2, "predicate"),
-      START_KEY((short)3, "start_key"),
-      FINISH_KEY((short)4, "finish_key"),
-      ROW_COUNT((short)5, "row_count"),
+      RANGE((short)3, "range"),
       /**
        * 
        * @see ConsistencyLevel
        */
-      CONSISTENCY_LEVEL((short)6, "consistency_level");
+      CONSISTENCY_LEVEL((short)4, "consistency_level");
 
       private static final Map<Integer, _Fields> byId = new HashMap<Integer, _Fields>();
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -9356,93 +9151,72 @@ public class Cassandra {
     }
 
     // isset id assignments
-    private static final int __ROW_COUNT_ISSET_ID = 0;
-    private BitSet __isset_bit_vector = new BitSet(1);
 
     public static final Map<_Fields, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new EnumMap<_Fields, FieldMetaData>(_Fields.class) {{
       put(_Fields.COLUMN_PARENT, new FieldMetaData("column_parent", TFieldRequirementType.REQUIRED, 
           new StructMetaData(TType.STRUCT, ColumnParent.class)));
       put(_Fields.PREDICATE, new FieldMetaData("predicate", TFieldRequirementType.REQUIRED, 
           new StructMetaData(TType.STRUCT, SlicePredicate.class)));
-      put(_Fields.START_KEY, new FieldMetaData("start_key", TFieldRequirementType.REQUIRED, 
-          new FieldValueMetaData(TType.STRING)));
-      put(_Fields.FINISH_KEY, new FieldMetaData("finish_key", TFieldRequirementType.REQUIRED, 
-          new FieldValueMetaData(TType.STRING)));
-      put(_Fields.ROW_COUNT, new FieldMetaData("row_count", TFieldRequirementType.REQUIRED, 
-          new FieldValueMetaData(TType.I32)));
+      put(_Fields.RANGE, new FieldMetaData("range", TFieldRequirementType.REQUIRED, 
+          new StructMetaData(TType.STRUCT, KeyRange.class)));
       put(_Fields.CONSISTENCY_LEVEL, new FieldMetaData("consistency_level", TFieldRequirementType.REQUIRED, 
           new EnumMetaData(TType.ENUM, ConsistencyLevel.class)));
     }});
 
     static {
-      FieldMetaData.addStructMetaDataMap(get_range_slice_args.class, metaDataMap);
+      FieldMetaData.addStructMetaDataMap(get_range_slices_args.class, metaDataMap);
     }
 
-    public get_range_slice_args() {
-      this.row_count = 100;
-
+    public get_range_slices_args() {
       this.consistency_level = ConsistencyLevel.ONE;
 
     }
 
-    public get_range_slice_args(
+    public get_range_slices_args(
       ColumnParent column_parent,
       SlicePredicate predicate,
-      byte[] start_key,
-      byte[] finish_key,
-      int row_count,
+      KeyRange range,
       ConsistencyLevel consistency_level)
     {
       this();
       this.column_parent = column_parent;
       this.predicate = predicate;
-      this.start_key = start_key;
-      this.finish_key = finish_key;
-      this.row_count = row_count;
-      setRow_countIsSet(true);
+      this.range = range;
       this.consistency_level = consistency_level;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public get_range_slice_args(get_range_slice_args other) {
-      __isset_bit_vector.clear();
-      __isset_bit_vector.or(other.__isset_bit_vector);
+    public get_range_slices_args(get_range_slices_args other) {
       if (other.isSetColumn_parent()) {
         this.column_parent = new ColumnParent(other.column_parent);
       }
       if (other.isSetPredicate()) {
         this.predicate = new SlicePredicate(other.predicate);
       }
-      if (other.isSetStart_key()) {
-        this.start_key = new byte[other.start_key.length];
-        System.arraycopy(other.start_key, 0, start_key, 0, other.start_key.length);
-      }
-      if (other.isSetFinish_key()) {
-        this.finish_key = new byte[other.finish_key.length];
-        System.arraycopy(other.finish_key, 0, finish_key, 0, other.finish_key.length);
+      if (other.isSetRange()) {
+        this.range = new KeyRange(other.range);
       }
-      this.row_count = other.row_count;
       if (other.isSetConsistency_level()) {
         this.consistency_level = other.consistency_level;
       }
     }
 
-    public get_range_slice_args deepCopy() {
-      return new get_range_slice_args(this);
+    public get_range_slices_args deepCopy() {
+      return new get_range_slices_args(this);
     }
 
     @Deprecated
-    public get_range_slice_args clone() {
-      return new get_range_slice_args(this);
+    public get_range_slices_args clone() {
+      return new get_range_slices_args(this);
     }
 
     public ColumnParent getColumn_parent() {
       return this.column_parent;
     }
 
-    public get_range_slice_args setColumn_parent(ColumnParent column_parent) {
+    public get_range_slices_args setColumn_parent(ColumnParent column_parent) {
       this.column_parent = column_parent;
       return this;
     }
@@ -9466,7 +9240,7 @@ public class Cassandra {
       return this.predicate;
     }
 
-    public get_range_slice_args setPredicate(SlicePredicate predicate) {
+    public get_range_slices_args setPredicate(SlicePredicate predicate) {
       this.predicate = predicate;
       return this;
     }
@@ -9486,77 +9260,30 @@ public class Cassandra {
       }
     }
 
-    public byte[] getStart_key() {
-      return this.start_key;
-    }
-
-    public get_range_slice_args setStart_key(byte[] 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 asigned 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[] getFinish_key() {
-      return this.finish_key;
+    public KeyRange getRange() {
+      return this.range;
     }
 
-    public get_range_slice_args setFinish_key(byte[] finish_key) {
-      this.finish_key = finish_key;
+    public get_range_slices_args setRange(KeyRange range) {
+      this.range = range;
       return this;
     }
 
-    public void unsetFinish_key() {
-      this.finish_key = null;
+    public void unsetRange() {
+      this.range = null;
     }
 
-    /** Returns true if field finish_key is set (has been asigned a value) and false otherwise */
-    public boolean isSetFinish_key() {
-      return this.finish_key != null;
+    /** Returns true if field range is set (has been asigned a value) and false otherwise */
+    public boolean isSetRange() {
+      return this.range != null;
     }
 
-    public void setFinish_keyIsSet(boolean value) {
+    public void setRangeIsSet(boolean value) {
       if (!value) {
-        this.finish_key = null;
+        this.range = null;
       }
     }
 
-    public int getRow_count() {
-      return this.row_count;
-    }
-
-    public get_range_slice_args setRow_count(int row_count) {
-      this.row_count = row_count;
-      setRow_countIsSet(true);
-      return this;
-    }
-
-    public void unsetRow_count() {
-      __isset_bit_vector.clear(__ROW_COUNT_ISSET_ID);
-    }
-
-    /** Returns true if field row_count is set (has been asigned a value) and false otherwise */
-    public boolean isSetRow_count() {
-      return __isset_bit_vector.get(__ROW_COUNT_ISSET_ID);
-    }
-
-    public void setRow_countIsSet(boolean value) {
-      __isset_bit_vector.set(__ROW_COUNT_ISSET_ID, value);
-    }
-
     /**
      * 
      * @see ConsistencyLevel
@@ -9569,7 +9296,7 @@ public class Cassandra {
      * 
      * @see ConsistencyLevel
      */
-    public get_range_slice_args setConsistency_level(ConsistencyLevel consistency_level) {
+    public get_range_slices_args setConsistency_level(ConsistencyLevel consistency_level) {
       this.consistency_level = consistency_level;
       return this;
     }
@@ -9607,27 +9334,11 @@ public class Cassandra {
         }
         break;
 
-      case START_KEY:
-        if (value == null) {
-          unsetStart_key();
-        } else {
-          setStart_key((byte[])value);
-        }
-        break;
-
-      case FINISH_KEY:
-        if (value == null) {
-          unsetFinish_key();
-        } else {
-          setFinish_key((byte[])value);
-        }
-        break;
-
-      case ROW_COUNT:
+      case RANGE:
         if (value == null) {
-          unsetRow_count();
+          unsetRange();
         } else {
-          setRow_count((Integer)value);
+          setRange((KeyRange)value);
         }
         break;
 
@@ -9654,14 +9365,8 @@ public class Cassandra {
       case PREDICATE:
         return getPredicate();
 
-      case START_KEY:
-        return getStart_key();
-
-      case FINISH_KEY:
-        return getFinish_key();
-
-      case ROW_COUNT:
-        return new Integer(getRow_count());
+      case RANGE:
+        return getRange();
 
       case CONSISTENCY_LEVEL:
         return getConsistency_level();
@@ -9681,12 +9386,8 @@ public class Cassandra {
         return isSetColumn_parent();
       case PREDICATE:
         return isSetPredicate();
-      case START_KEY:
-        return isSetStart_key();
-      case FINISH_KEY:
-        return isSetFinish_key();
-      case ROW_COUNT:
-        return isSetRow_count();
+      case RANGE:
+        return isSetRange();
       case CONSISTENCY_LEVEL:
         return isSetConsistency_level();
       }
@@ -9701,12 +9402,12 @@ public class Cassandra {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof get_range_slice_args)
-        return this.equals((get_range_slice_args)that);
+      if (that instanceof get_range_slices_args)
+        return this.equals((get_range_slices_args)that);
       return false;
     }
 
-    public boolean equals(get_range_slice_args that) {
+    public boolean equals(get_range_slices_args that) {
       if (that == null)
         return false;
 
@@ -9728,30 +9429,12 @@ public class Cassandra {
           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 (!java.util.Arrays.equals(this.start_key, that.start_key))
-          return false;
-      }
-
-      boolean this_present_finish_key = true && this.isSetFinish_key();
-      boolean that_present_finish_key = true && that.isSetFinish_key();
-      if (this_present_finish_key || that_present_finish_key) {
-        if (!(this_present_finish_key && that_present_finish_key))
-          return false;
-        if (!java.util.Arrays.equals(this.finish_key, that.finish_key))
-          return false;
-      }
-
-      boolean this_present_row_count = true;
-      boolean that_present_row_count = true;
-      if (this_present_row_count || that_present_row_count) {
-        if (!(this_present_row_count && that_present_row_count))
+      boolean this_present_range = true && this.isSetRange();
+      boolean that_present_range = true && that.isSetRange();
+      if (this_present_range || that_present_range) {
+        if (!(this_present_range && that_present_range))
           return false;
-        if (this.row_count != that.row_count)
+        if (!this.range.equals(that.range))
           return false;
       }
 
@@ -9772,13 +9455,13 @@ public class Cassandra {
       return 0;
     }
 
-    public int compareTo(get_range_slice_args other) {
+    public int compareTo(get_range_slices_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      get_range_slice_args typedOther = (get_range_slice_args)other;
+      get_range_slices_args typedOther = (get_range_slices_args)other;
 
       lastComparison = Boolean.valueOf(isSetColumn_parent()).compareTo(typedOther.isSetColumn_parent());
       if (lastComparison != 0) {
@@ -9798,38 +9481,20 @@ public class Cassandra {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetStart_key()).compareTo(typedOther.isSetStart_key());
+      lastComparison = Boolean.valueOf(isSetRange()).compareTo(typedOther.isSetRange());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetStart_key()) {        lastComparison = TBaseHelper.compareTo(start_key, typedOther.start_key);
+      if (isSetRange()) {        lastComparison = TBaseHelper.compareTo(range, typedOther.range);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFinish_key()).compareTo(typedOther.isSetFinish_key());
+      lastComparison = Boolean.valueOf(isSetConsistency_level()).compareTo(typedOther.isSetConsistency_level());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetFinish_key()) {        lastComparison = TBaseHelper.compareTo(finish_key, typedOther.finish_key);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = Boolean.valueOf(isSetRow_count()).compareTo(typedOther.isSetRow_count());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetRow_count()) {        lastComparison = TBaseHelper.compareTo(row_count, typedOther.row_count);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = Boolean.valueOf(isSetConsistency_level()).compareTo(typedOther.isSetConsistency_level());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetConsistency_level()) {        lastComparison = TBaseHelper.compareTo(consistency_level, typedOther.consistency_level);
+      if (isSetConsistency_level()) {        lastComparison = TBaseHelper.compareTo(consistency_level, typedOther.consistency_level);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -9863,29 +9528,15 @@ public class Cassandra {
               TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case 3: // START_KEY
-            if (field.type == TType.STRING) {
-              this.start_key = iprot.readBinary();
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case 4: // FINISH_KEY
-            if (field.type == TType.STRING) {
-              this.finish_key = iprot.readBinary();
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case 5: // ROW_COUNT
-            if (field.type == TType.I32) {
-              this.row_count = iprot.readI32();
-              setRow_countIsSet(true);
+          case 3: // RANGE
+            if (field.type == TType.STRUCT) {
+              this.range = new KeyRange();
+              this.range.read(iprot);
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case 6: // CONSISTENCY_LEVEL
+          case 4: // CONSISTENCY_LEVEL
             if (field.type == TType.I32) {
               this.consistency_level = ConsistencyLevel.findByValue(iprot.readI32());
             } else { 
@@ -9900,9 +9551,6 @@ public class Cassandra {
       iprot.readStructEnd();
 
       // check for required fields of primitive type, which can't be checked in the validate method
-      if (!isSetRow_count()) {
-        throw new TProtocolException("Required field 'row_count' was not found in serialized data! Struct: " + toString());
-      }
       validate();
     }
 
@@ -9920,19 +9568,11 @@ public class Cassandra {
         this.predicate.write(oprot);
         oprot.writeFieldEnd();
       }
-      if (this.start_key != null) {
-        oprot.writeFieldBegin(START_KEY_FIELD_DESC);
-        oprot.writeBinary(this.start_key);
-        oprot.writeFieldEnd();
-      }
-      if (this.finish_key != null) {
-        oprot.writeFieldBegin(FINISH_KEY_FIELD_DESC);
-        oprot.writeBinary(this.finish_key);
+      if (this.range != null) {
+        oprot.writeFieldBegin(RANGE_FIELD_DESC);
+        this.range.write(oprot);
         oprot.writeFieldEnd();
       }
-      oprot.writeFieldBegin(ROW_COUNT_FIELD_DESC);
-      oprot.writeI32(this.row_count);
-      oprot.writeFieldEnd();
       if (this.consistency_level != null) {
         oprot.writeFieldBegin(CONSISTENCY_LEVEL_FIELD_DESC);
         oprot.writeI32(this.consistency_level.getValue());
@@ -9944,7 +9584,7 @@ public class Cassandra {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("get_range_slice_args(");
+      StringBuilder sb = new StringBuilder("get_range_slices_args(");
       boolean first = true;
 
       sb.append("column_parent:");
@@ -9963,36 +9603,14 @@ public class Cassandra {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("start_key:");
-      if (this.start_key == null) {
-        sb.append("null");
-      } else {
-          int __start_key_size = Math.min(this.start_key.length, 128);
-          for (int i = 0; i < __start_key_size; i++) {
-            if (i != 0) sb.append(" ");
-            sb.append(Integer.toHexString(this.start_key[i]).length() > 1 ? Integer.toHexString(this.start_key[i]).substring(Integer.toHexString(this.start_key[i]).length() - 2).toUpperCase() : "0" + Integer.toHexString(this.start_key[i]).toUpperCase());
-          }
-          if (this.start_key.length > 128) sb.append(" ...");
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("finish_key:");
-      if (this.finish_key == null) {
+      sb.append("range:");
+      if (this.range == null) {
         sb.append("null");
       } else {
-          int __finish_key_size = Math.min(this.finish_key.length, 128);
-          for (int i = 0; i < __finish_key_size; i++) {
-            if (i != 0) sb.append(" ");
-            sb.append(Integer.toHexString(this.finish_key[i]).length() > 1 ? Integer.toHexString(this.finish_key[i]).substring(Integer.toHexString(this.finish_key[i]).length() - 2).toUpperCase() : "0" + Integer.toHexString(this.finish_key[i]).toUpperCase());
-          }
-          if (this.finish_key.length > 128) sb.append(" ...");
+        sb.append(this.range);
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("row_count:");
-      sb.append(this.row_count);
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("consistency_level:");
       if (this.consistency_level == null) {
         sb.append("null");
@@ -10012,13 +9630,9 @@ public class Cassandra {
       if (predicate == null) {
         throw new TProtocolException("Required field 'predicate' was not present! Struct: " + toString());
       }
-      if (start_key == null) {
-        throw new TProtocolException("Required field 'start_key' was not present! Struct: " + toString());
-      }
-      if (finish_key == null) {
-        throw new TProtocolException("Required field 'finish_key' was not present! Struct: " + toString());
+      if (range == null) {
+        throw new TProtocolException("Required field 'range' was not present! Struct: " + toString());
       }
-      // alas, we cannot check 'row_count' because it's a primitive and you chose the non-beans generator.
       if (consistency_level == null) {
         throw new TProtocolException("Required field 'consistency_level' was not present! Struct: " + toString());
       }
@@ -10026,8 +9640,8 @@ public class Cassandra {
 
   }
 
-  public static class get_range_slice_result implements TBase<get_range_slice_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_range_slice_result>   {
-    private static final TStruct STRUCT_DESC = new TStruct("get_range_slice_result");
+  public static class get_range_slices_result implements TBase<get_range_slices_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_range_slices_result>   {
+    private static final TStruct STRUCT_DESC = new TStruct("get_range_slices_result");
 
     private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.LIST, (short)0);
     private static final TField IRE_FIELD_DESC = new TField("ire", TType.STRUCT, (short)1);
@@ -10112,13 +9726,13 @@ public class Cassandra {
     }});
 
     static {
-      FieldMetaData.addStructMetaDataMap(get_range_slice_result.class, metaDataMap);
+      FieldMetaData.addStructMetaDataMap(get_range_slices_result.class, metaDataMap);
     }
 
-    public get_range_slice_result() {
+    public get_range_slices_result() {
     }
 
-    public get_range_slice_result(
+    public get_range_slices_result(
       List<KeySlice> success,
       InvalidRequestException ire,
       UnavailableException ue,
@@ -10134,7 +9748,7 @@ public class Cassandra {
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public get_range_slice_result(get_range_slice_result other) {
+    public get_range_slices_result(get_range_slices_result other) {
       if (other.isSetSuccess()) {
         List<KeySlice> __this__success = new ArrayList<KeySlice>();
         for (KeySlice other_element : other.success) {
@@ -10153,13 +9767,13 @@ public class Cassandra {
       }
     }
 
-    public get_range_slice_result deepCopy() {
-      return new get_range_slice_result(this);
+    public get_range_slices_result deepCopy() {
+      return new get_range_slices_result(this);
     }
 
     @Deprecated
-    public get_range_slice_result clone() {
-      return new get_range_slice_result(this);
+    public get_range_slices_result clone() {
+      return new get_range_slices_result(this);
     }
 
     public int getSuccessSize() {
@@ -10181,7 +9795,7 @@ public class Cassandra {
       return this.success;
     }
 
-    public get_range_slice_result setSuccess(List<KeySlice> success) {
+    public get_range_slices_result setSuccess(List<KeySlice> success) {
       this.success = success;
       return this;
     }
@@ -10205,7 +9819,7 @@ public class Cassandra {
       return this.ire;
     }
 
-    public get_range_slice_result setIre(InvalidRequestException ire) {
+    public get_range_slices_result setIre(InvalidRequestException ire) {
       this.ire = ire;
       return this;
     }
@@ -10229,7 +9843,7 @@ public class Cassandra {
       return this.ue;
     }
 
-    public get_range_slice_result setUe(UnavailableException ue) {
+    public get_range_slices_result setUe(UnavailableException ue) {
       this.ue = ue;
       return this;
     }
@@ -10253,7 +9867,7 @@ public class Cassandra {
       return this.te;
     }
 
-    public get_range_slice_result setTe(TimedOutException te) {
+    public get_range_slices_result setTe(TimedOutException te) {
       this.te = te;
       return this;
     }
@@ -10359,12 +9973,12 @@ public class Cassandra {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof get_range_slice_result)
-        return this.equals((get_range_slice_result)that);
+      if (that instanceof get_range_slices_result)
+        return this.equals((get_range_slices_result)that);
       return false;
     }
 
-    public boolean equals(get_range_slice_result that) {
+    public boolean equals(get_range_slices_result that) {
       if (that == null)
         return false;
 
@@ -10412,13 +10026,13 @@ public class Cassandra {
       return 0;
     }
 
-    public int compareTo(get_range_slice_result other) {
+    public int compareTo(get_range_slices_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      get_range_slice_result typedOther = (get_range_slice_result)other;
+      get_range_slices_result typedOther = (get_range_slices_result)other;
 
       lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
       if (lastComparison != 0) {
@@ -10555,7 +10169,7 @@ public class Cassandra {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("get_range_slice_result(");
+      StringBuilder sb = new StringBuilder("get_range_slices_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -10599,17 +10213,17 @@ public class Cassandra {
 
   }
 
-  public static class get_range_slices_args implements TBase<get_range_slices_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_range_slices_args>   {
-    private static final TStruct STRUCT_DESC = new TStruct("get_range_slices_args");
+  public static class insert_args implements TBase<insert_args._Fields>, java.io.Serializable, Cloneable, Comparable<insert_args>   {
+    private static final TStruct STRUCT_DESC = new TStruct("insert_args");
 
-    private static final TField COLUMN_PARENT_FIELD_DESC = new TField("column_parent", TType.STRUCT, (short)1);
-    private static final TField PREDICATE_FIELD_DESC = new TField("predicate", TType.STRUCT, (short)2);
-    private static final TField RANGE_FIELD_DESC = new TField("range", TType.STRUCT, (short)3);
+    private static final TField KEY_FIELD_DESC = new TField("key", TType.STRING, (short)1);
+    private static final TField COLUMN_PARENT_FIELD_DESC = new TField("column_parent", TType.STRUCT, (short)2);
+    private static final TField COLUMN_FIELD_DESC = new TField("column", TType.STRUCT, (short)3);
     private static final TField CONSISTENCY_LEVEL_FIELD_DESC = new TField("consistency_level", TType.I32, (short)4);
 
+    public byte[] key;
     public ColumnParent column_parent;
-    public SlicePredicate predicate;
-    public KeyRange range;
+    public Column column;
     /**
      * 
      * @see ConsistencyLevel
@@ -10618,9 +10232,9 @@ public class Cassandra {
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements TFieldIdEnum {
-      COLUMN_PARENT((short)1, "column_parent"),
-      PREDICATE((short)2, "predicate"),
-      RANGE((short)3, "range"),
+      KEY((short)1, "key"),
+      COLUMN_PARENT((short)2, "column_parent"),
+      COLUMN((short)3, "column"),
       /**
        * 
        * @see ConsistencyLevel
@@ -10681,134 +10295,135 @@ public class Cassandra {
     // isset id assignments
 
     public static final Map<_Fields, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new EnumMap<_Fields, FieldMetaData>(_Fields.class) {{
+      put(_Fields.KEY, new FieldMetaData("key", TFieldRequirementType.REQUIRED, 
+          new FieldValueMetaData(TType.STRING)));
       put(_Fields.COLUMN_PARENT, new FieldMetaData("column_parent", TFieldRequirementType.REQUIRED, 
           new StructMetaData(TType.STRUCT, ColumnParent.class)));
-      put(_Fields.PREDICATE, new FieldMetaData("predicate", TFieldRequirementType.REQUIRED, 
-          new StructMetaData(TType.STRUCT, SlicePredicate.class)));
-      put(_Fields.RANGE, new FieldMetaData("range", TFieldRequirementType.REQUIRED, 
-          new StructMetaData(TType.STRUCT, KeyRange.class)));
+      put(_Fields.COLUMN, new FieldMetaData("column", TFieldRequirementType.REQUIRED, 
+          new StructMetaData(TType.STRUCT, Column.class)));
       put(_Fields.CONSISTENCY_LEVEL, new FieldMetaData("consistency_level", TFieldRequirementType.REQUIRED, 
           new EnumMetaData(TType.ENUM, ConsistencyLevel.class)));
     }});
 
     static {
-      FieldMetaData.addStructMetaDataMap(get_range_slices_args.class, metaDataMap);
+      FieldMetaData.addStructMetaDataMap(insert_args.class, metaDataMap);
     }
 
-    public get_range_slices_args() {
+    public insert_args() {
       this.consistency_level = ConsistencyLevel.ONE;
 
     }
 
-    public get_range_slices_args(
+    public insert_args(
+      byte[] key,
       ColumnParent column_parent,
-      SlicePredicate predicate,
-      KeyRange range,
+      Column column,
       ConsistencyLevel consistency_level)
     {
       this();
+      this.key = key;
       this.column_parent = column_parent;
-      this.predicate = predicate;
-      this.range = range;
+      this.column = column;
       this.consistency_level = consistency_level;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public get_range_slices_args(get_range_slices_args other) {
+    public insert_args(insert_args other) {
+      if (other.isSetKey()) {
+        this.key = new byte[other.key.length];
+        System.arraycopy(other.key, 0, key, 0, other.key.length);
+      }
       if (other.isSetColumn_parent()) {
         this.column_parent = new ColumnParent(other.column_parent);
       }
-      if (other.isSetPredicate()) {
-        this.predicate = new SlicePredicate(other.predicate);
-      }
-      if (other.isSetRange()) {
-        this.range = new KeyRange(other.range);
+      if (other.isSetColumn()) {
+        this.column = new Column(other.column);
       }
       if (other.isSetConsistency_level()) {
         this.consistency_level = other.consistency_level;
       }
     }
 
-    public get_range_slices_args deepCopy() {
-      return new get_range_slices_args(this);
+    public insert_args deepCopy() {
+      return new insert_args(this);
     }
 
     @Deprecated
-    public get_range_slices_args clone() {
-      return new get_range_slices_args(this);
+    public insert_args clone() {
+      return new insert_args(this);
     }
 
-    public ColumnParent getColumn_parent() {
-      return this.column_parent;
+    public byte[] getKey() {
+      return this.key;
     }
 
-    public get_range_slices_args setColumn_parent(ColumnParent column_parent) {
-      this.column_parent = column_parent;
+    public insert_args setKey(byte[] key) {
+      this.key = key;
       return this;
     }
 
-    public void unsetColumn_parent() {
-      this.column_parent = null;
+    public void unsetKey() {
+      this.key = null;
     }
 
-    /** Returns true if field column_parent is set (has been asigned a value) and false otherwise */
-    public boolean isSetColumn_parent() {
-      return this.column_parent != null;
+    /** Returns true if field key is set (has been asigned a value) and false otherwise */
+    public boolean isSetKey() {
+      return this.key != null;
     }
 
-    public void setColumn_parentIsSet(boolean value) {
+    public void setKeyIsSet(boolean value) {
       if (!value) {
-        this.column_parent = null;
+        this.key = null;
       }
     }
 
-    public SlicePredicate getPredicate() {
-      return this.predicate;
+    public ColumnParent getColumn_parent() {
+      return this.column_parent;
     }
 
-    public get_range_slices_args setPredicate(SlicePredicate predicate) {
-      this.predicate = predicate;
+    public insert_args setColumn_parent(ColumnParent column_parent) {
+      this.column_parent = column_parent;
       return this;
     }
 
-    public void unsetPredicate() {
-      this.predicate = null;
+    public void unsetColumn_parent() {
+      this.column_parent = null;
     }
 
-    /** Returns true if field predicate is set (has been asigned a value) and false otherwise */
-    public boolean isSetPredicate() {
-      return this.predicate != null;
+    /** Returns true if field column_parent is set (has been asigned a value) and false otherwise */
+    public boolean isSetColumn_parent() {
+      return this.column_parent != null;
     }
 
-    public void setPredicateIsSet(boolean value) {
+    public void setColumn_parentIsSet(boolean value) {
       if (!value) {
-        this.predicate = null;
+        this.column_parent = null;
       }
     }
 
-    public KeyRange getRange() {
-      return this.range;
+    public Column getColumn() {
+      return this.column;
     }
 
-    public get_range_slices_args setRange(KeyRange range) {
-      this.range = range;
+    public insert_args setColumn(Column column) {
+      this.column = column;
       return this;
     }
 
-    public void unsetRange() {
-      this.range = null;
+    public void unsetColumn() {
+      this.column = null;
     }
 
-    /** Returns true if field range is set (has been asigned a value) and false otherwise */
-    public boolean isSetRange() {
-      return this.range != null;
+    /** Returns true if field column is set (has been asigned a value) and false otherwise */
+    public boolean isSetColumn() {
+      return this.column != null;
     }
 
-    public void setRangeIsSet(boolean value) {
+    public void setColumnIsSet(boolean value) {
       if (!value) {
-        this.range = null;
+        this.column = null;
       }
     }
 
@@ -10824,7 +10439,7 @@ public class Cassandra {
      * 
      * @see ConsistencyLevel
      */
-    public get_range_slices_args setConsistency_level(ConsistencyLevel consistency_level) {
+    public insert_args setConsistency_level(ConsistencyLevel consistency_level) {
       this.consistency_level = consistency_level;
       return this;
     }
@@ -10846,27 +10461,27 @@ public class Cassandra {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case COLUMN_PARENT:
+      case KEY:
         if (value == null) {
-          unsetColumn_parent();
+          unsetKey();
         } else {
-          setColumn_parent((ColumnParent)value);
+          setKey((byte[])value);
         }
         break;
 
-      case PREDICATE:
+      case COLUMN_PARENT:
         if (value == null) {
-          unsetPredicate();
+          unsetColumn_parent();
         } else {
-          setPredicate((SlicePredicate)value);
+          setColumn_parent((ColumnParent)value);
         }
         break;
 
-      case RANGE:
+      case COLUMN:
         if (value == null) {
-          unsetRange();
+          unsetColumn();
         } else {
-          setRange((KeyRange)value);
+          setColumn((Column)value);
         }
         break;
 
@@ -10887,14 +10502,14 @@ public class Cassandra {
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
+      case KEY:
+        return getKey();
+
       case COLUMN_PARENT:
         return getColumn_parent();
 
-      case PREDICATE:
-        return getPredicate();
-
-      case RANGE:
-        return getRange();
+      case COLUMN:
+        return getColumn();
 
       case CONSISTENCY_LEVEL:
         return getConsistency_level();
@@ -10910,12 +10525,12 @@ public class Cassandra {
     /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       switch (field) {
+      case KEY:
+        return isSetKey();
       case COLUMN_PARENT:
         return isSetColumn_parent();
-      case PREDICATE:
-        return isSetPredicate();
-      case RANGE:
-        return isSetRange();
+      case COLUMN:
+        return isSetColumn();
       case CONSISTENCY_LEVEL:
         return isSetConsistency_level();
       }
@@ -10930,39 +10545,39 @@ public class Cassandra {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof get_range_slices_args)
-        return this.equals((get_range_slices_args)that);
+      if (that instanceof insert_args)
+        return this.equals((insert_args)that);
       return false;
     }
 
-    public boolean equals(get_range_slices_args that) {
+    public boolean equals(insert_args that) {
       if (that == null)
         return false;
 
-      boolean this_present_column_parent = true && this.isSetColumn_parent();
-      boolean that_present_column_parent = true && that.isSetColumn_parent();
-      if (this_present_column_parent || that_present_column_parent) {
-        if (!(this_present_column_parent && that_present_column_parent))
+      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.column_parent.equals(that.column_parent))
+        if (!java.util.Arrays.equals(this.key, that.key))
           return false;
       }
 
-      boolean this_present_predicate = true && this.isSetPredicate();
-      boolean that_present_predicate = true && that.isSetPredicate();
-      if (this_present_predicate || that_present_predicate) {
-        if (!(this_present_predicate && that_present_predicate))
+      boolean this_present_column_parent = true && this.isSetColumn_parent();
+      boolean that_present_column_parent = true && that.isSetColumn_parent();
+      if (this_present_column_parent || that_present_column_parent) {
+        if (!(this_present_column_parent && that_present_column_parent))
           return false;
-        if (!this.predicate.equals(that.predicate))
+        if (!this.column_parent.equals(that.column_parent))
           return false;
       }
 
-      boolean this_present_range = true && this.isSetRange();
-      boolean that_present_range = true && that.isSetRange();
-      if (this_present_range || that_present_range) {
-        if (!(this_present_range && that_present_range))
+      boolean this_present_column = true && this.isSetColumn();
+      boolean that_present_column = true && that.isSetColumn();
+      if (this_present_column || that_present_column) {
+        if (!(this_present_column && that_present_column))
           return false;
-        if (!this.range.equals(that.range))
+        if (!this.column.equals(that.column))
           return false;
       }
 
@@ -10983,37 +10598,37 @@ public class Cassandra {
       return 0;
     }
 
-    public int compareTo(get_range_slices_args other) {
+    public int compareTo(insert_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      get_range_slices_args typedOther = (get_range_slices_args)other;
+      insert_args typedOther = (insert_args)other;
 
-      lastComparison = Boolean.valueOf(isSetColumn_parent()).compareTo(typedOther.isSetColumn_parent());
+      lastComparison = Boolean.valueOf(isSetKey()).compareTo(typedOther.isSetKey());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetColumn_parent()) {        lastComparison = TBaseHelper.compareTo(column_parent, typedOther.column_parent);
+      if (isSetKey()) {        lastComparison = TBaseHelper.compareTo(key, typedOther.key);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetPredicate()).compareTo(typedOther.isSetPredicate());
+      lastComparison = Boolean.valueOf(isSetColumn_parent()).compareTo(typedOther.isSetColumn_parent());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetPredicate()) {        lastComparison = TBaseHelper.compareTo(predicate, typedOther.predicate);
+      if (isSetColumn_parent()) {        lastComparison = TBaseHelper.compareTo(column_parent, typedOther.column_parent);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetRange()).compareTo(typedOther.isSetRange());
+      lastComparison = Boolean.valueOf(isSetColumn()).compareTo(typedOther.isSetColumn());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetRange()) {        lastComparison = TBaseHelper.compareTo(range, typedOther.range);
+      if (isSetColumn()) {        lastComparison = TBaseHelper.compareTo(column, typedOther.column);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -11040,26 +10655,25 @@ public class Cassandra {
           break;
         }
         switch (field.id) {
-          case 1: // COLUMN_PARENT
-            if (field.type == TType.STRUCT) {
-              this.column_parent = new ColumnParent();
-              this.column_parent.read(iprot);
+          case 1: // KEY
+            if (field.type == TType.STRING) {
+              this.key = iprot.readBinary();
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case 2: // PREDICATE
+          case 2: // COLUMN_PARENT
             if (field.type == TType.STRUCT) {
-              this.predicate = new SlicePredicate();
-              this.predicate.read(iprot);
+              this.column_parent = new ColumnParent();
+              this.column_parent.read(iprot);
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case 3: // RANGE
+          case 3: // COLUMN
             if (field.type == TType.STRUCT) {
-              this.range = new KeyRange();
-              this.range.read(iprot);
+              this.column = new Column();
+              this.column.read(iprot);
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
@@ -11086,19 +10700,19 @@ public class Cassandra {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
+      if (this.key != null) {
+        oprot.writeFieldBegin(KEY_FIELD_DESC);
+        oprot.writeBinary(this.key);
+        oprot.writeFieldEnd();
+      }
       if (this.column_parent != null) {
         oprot.writeFieldBegin(COLUMN_PARENT_FIELD_DESC);
         this.column_parent.write(oprot);
         oprot.writeFieldEnd();
       }
-      if (this.predicate != null) {
-        oprot.writeFieldBegin(PREDICATE_FIELD_DESC);
-        this.predicate.write(oprot);
-        oprot.writeFieldEnd();
-      }
-      if (this.range != null) {
-        oprot.writeFieldBegin(RANGE_FIELD_DESC);
-        this.range.write(oprot);
+      if (this.column != null) {
+        oprot.writeFieldBegin(COLUMN_FIELD_DESC);
+        this.column.write(oprot);
         oprot.writeFieldEnd();
       }
       if (this.consistency_level != null) {
@@ -11112,30 +10726,35 @@ public class Cassandra {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("get_range_slices_args(");
+      StringBuilder sb = new StringBuilder("insert_args(");
       boolean first = true;
 
-      sb.append("column_parent:");
-      if (this.column_parent == null) {
+      sb.append("key:");
+      if (this.key == null) {
         sb.append("null");
       } else {
-        sb.append(this.column_parent);
+          int __key_size = Math.min(this.key.length, 128);
+          for (int i = 0; i < __key_size; i++) {
+            if (i != 0) sb.append(" ");
+            sb.append(Integer.toHexString(this.key[i]).length() > 1 ? Integer.toHexString(this.key[i]).substring(Integer.toHexString(this.key[i]).length() - 2).toUpperCase() : "0" + Integer.toHexString(this.key[i]).toUpperCase());
+          }
+          if (this.key.length > 128) sb.append(" ...");
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("predicate:");
-      if (this.predicate == null) {
+      sb.append("column_parent:");
+      if (this.column_parent == null) {
         sb.append("null");
       } else {
-        sb.append(this.predicate);
+        sb.append(this.column_parent);
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("range:");
-      if (this.range == null) {
+      sb.append("column:");
+      if (this.column == null) {
         sb.append("null");
       } else {
-        sb.append(this.range);
+        sb.append(this.column);
       }
       first = false;
       if (!first) sb.append(", ");
@@ -11152,14 +10771,14 @@ public class Cassandra {
 
     public void validate() throws TException {
       // check for required fields
+      if (key == null) {
+        throw new TProtocolException("Required field 'key' was not present! Struct: " + toString());
+      }
       if (column_parent == null) {
         throw new TProtocolException("Required field 'column_parent' was not present! Struct: " + toString());
       }
-      if (predicate == null) {
-        throw new TProtocolException("Required field 'predicate' was not present! Struct: " + toString());
-      }
-      if (range == null) {
-        throw new TProtocolException("Required field 'range' was not present! Struct: " + toString());
+      if (column == null) {
+        throw new TProtocolException("Required field 'column' was not present! Struct: " + toString());
       }
       if (consistency_level == null) {
         throw new TProtocolException("Required field 'consistency_level' was not present! Struct: " + toString());
@@ -11168,22 +10787,19 @@ public class Cassandra {
 
   }
 
-  public static class get_range_slices_result implements TBase<get_range_slices_result._Fields>, java.io.Serializable, Cloneable, Comparable<get_range_slices_result>   {
-    private static final TStruct STRUCT_DESC = new TStruct("get_range_slices_result");
+  public static class insert_result implements TBase<insert_result._Fields>, java.io.Serializable, Cloneable, Comparable<insert_result>   {
+    private static final TStruct STRUCT_DESC = new TStruct("insert_result");
 
-    private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.LIST, (short)0);
     private static final TField IRE_FIELD_DESC = new TField("ire", TType.STRUCT, (short)1);
     private static final TField UE_FIELD_DESC = new TField("ue", TType.STRUCT, (short)2);
     private static final TField TE_FIELD_DESC = new TField("te", TType.STRUCT, (short)3);
 
-    public List<KeySlice> success;
     public InvalidRequestException ire;
     public UnavailableException ue;
     public TimedOutException te;
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements TFieldIdEnum {
-      SUCCESS((short)0, "success"),
       IRE((short)1, "ire"),
       UE((short)2, "ue"),
       TE((short)3, "te");
@@ -11242,9 +10858,6 @@ public class Cassandra {
     // isset id assignments
 
     public static final Map<_Fields, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new EnumMap<_Fields, FieldMetaData>(_Fields.class) {{
-      put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, 
-          new ListMetaData(TType.LIST, 
-              new StructMetaData(TType.STRUCT, KeySlice.class))));
       put(_Fields.IRE, new FieldMetaData("ire", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRUCT)));
       put(_Fields.UE, new FieldMetaData("ue", TFieldRequirementType.DEFAULT, 
@@ -11254,20 +10867,18 @@ public class Cassandra {
     }});
 
     static {
-      FieldMetaData.addStructMetaDataMap(get_range_slices_result.class, metaDataMap);
+      FieldMetaData.addStructMetaDataMap(insert_result.class, metaDataMap);
     }
 
-    public get_range_slices_result() {
+    public insert_result() {
     }
 
-    public get_range_slices_result(
-      List<KeySlice> success,
+    public insert_result(
       InvalidRequestException ire,
       UnavailableException ue,
       TimedOutException te)
     {
       this();
-      this.success = success;
       this.ire = ire;
       this.ue = ue;
       this.te = te;
@@ -11276,14 +10887,7 @@ public class Cassandra {
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public get_range_slices_result(get_range_slices_result other) {
-      if (other.isSetSuccess()) {
-        List<KeySlice> __this__success = new ArrayList<KeySlice>();
-        for (KeySlice other_element : other.success) {
-          __this__success.add(new KeySlice(other_element));
-        }
-        this.success = __this__success;
-      }
+    public insert_result(insert_result other) {
       if (other.isSetIre()) {
         this.ire = new InvalidRequestException(other.ire);
       }
@@ -11295,59 +10899,20 @@ public class Cassandra {
       }
     }
 
-    public get_range_slices_result deepCopy() {
-      return new get_range_slices_result(this);
+    public insert_result deepCopy() {
+      return new insert_result(this);
     }
 
     @Deprecated
-    public get_range_slices_result clone() {
-      return new get_range_slices_result(this);
-    }
-
-    public int getSuccessSize() {
-      return (this.success == null) ? 0 : this.success.size();
-    }
-
-    public java.util.Iterator<KeySlice> getSuccessIterator() {
-      return (this.success == null) ? null : this.success.iterator();
-    }
-
-    public void addToSuccess(KeySlice elem) {
-      if (this.success == null) {
-        this.success = new ArrayList<KeySlice>();
-      }
-      this.success.add(elem);
-    }
-
-    public List<KeySlice> getSuccess() {
-      return this.success;
-    }
-
-    public get_range_slices_result setSuccess(List<KeySlice> success) {
-      this.success = success;
-      return this;
-    }
-
-    public void unsetSuccess() {
-      this.success = null;
-    }
-
-    /** Returns true if field success is set (has been asigned a value) and false otherwise */
-    public boolean isSetSuccess() {
-      return this.success != null;
-    }
-
-    public void setSuccessIsSet(boolean value) {
-      if (!value) {
-        this.success = null;
-      }
+    public insert_result clone() {
+      return new insert_result(this);
     }
 
     public InvalidRequestException getIre() {
       return this.ire;
     }
 
-    public get_range_slices_result setIre(InvalidRequestException ire) {
+    public insert_result setIre(InvalidRequestException ire) {
       this.ire = ire;
       return this;
     }
@@ -11371,7 +10936,7 @@ public class Cassandra {
       return this.ue;
     }
 
-    public get_range_slices_result setUe(UnavailableException ue) {
+    public insert_result setUe(UnavailableException ue) {
       this.ue = ue;
       return this;
     }
@@ -11395,7 +10960,7 @@ public class Cassandra {
       return this.te;
     }
 
-    public get_range_slices_result setTe(TimedOutException te) {
+    public insert_result setTe(TimedOutException te) {
       this.te = te;
       return this;
     }
@@ -11417,14 +10982,6 @@ public class Cassandra {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((List<KeySlice>)value);
-        }
-        break;
-
       case IRE:
         if (value == null) {
           unsetIre();
@@ -11458,9 +11015,6 @@ public class Cassandra {
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SUCCESS:
-        return getSuccess();
-
       case IRE:
         return getIre();
 
@@ -11481,8 +11035,6 @@ public class Cassandra {
     /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
       case IRE:
         return isSetIre();
       case UE:
@@ -11501,24 +11053,15 @@ public class Cassandra {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof get_range_slices_result)
-        return this.equals((get_range_slices_result)that);
+      if (that instanceof insert_result)
+        return this.equals((insert_result)that);
       return false;
     }
 
-    public boolean equals(get_range_slices_result that) {
+    public boolean equals(insert_result that) {
       if (that == null)
         return false;
 
-      boolean this_present_success = true && this.isSetSuccess();
-      boolean that_present_success = true && that.isSetSuccess();
-      if (this_present_success || that_present_success) {
-        if (!(this_present_success && that_present_success))
-          return false;
-        if (!this.success.equals(that.success))
-          return false;
-      }
-
       boolean this_present_ire = true && this.isSetIre();
       boolean that_present_ire = true && that.isSetIre();
       if (this_present_ire || that_present_ire) {
@@ -11554,23 +11097,14 @@ public class Cassandra {
       return 0;
     }
 
-    public int compareTo(get_range_slices_result other) {
+    public int compareTo(insert_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      get_range_slices_result typedOther = (get_range_slices_result)other;
+      insert_result typedOther = (insert_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetSuccess()) {        lastComparison = TBaseHelper.compareTo(success, typedOther.success);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       lastComparison = Boolean.valueOf(isSetIre()).compareTo(typedOther.isSetIre());
       if (lastComparison != 0) {
         return lastComparison;
@@ -11611,24 +11145,6 @@ public class Cassandra {
           break;
         }
         switch (field.id) {
-          case 0: // SUCCESS
-            if (field.type == TType.LIST) {
-              {
-                TList _list59 = iprot.readListBegin();
-                this.success = new ArrayList<KeySlice>(_list59.size);
-                for (int _i60 = 0; _i60 < _list59.size; ++_i60)
-                {
-                  KeySlice _elem61;
-                  _elem61 = new KeySlice();
-                  _elem61.read(iprot);
-                  this.success.add(_elem61);
-                }
-                iprot.readListEnd();
-              }
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
           case 1: // IRE
             if (field.type == TType.STRUCT) {
               this.ire = new InvalidRequestException();
@@ -11667,18 +11183,7 @@ public class Cassandra {
     public void write(TProtocol oprot) throws TException {
       oprot.writeStructBegin(STRUCT_DESC);
 
-      if (this.isSetSuccess()) {
-        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-        {
-          oprot.writeListBegin(new TList(TType.STRUCT, this.success.size()));
-          for (KeySlice _iter62 : this.success)
-          {
-            _iter62.write(oprot);
-          }
-          oprot.writeListEnd();
-        }
-        oprot.writeFieldEnd();
-      } else if (this.isSetIre()) {
+      if (this.isSetIre()) {
         oprot.writeFieldBegin(IRE_FIELD_DESC);
         this.ire.write(oprot);
         oprot.writeFieldEnd();
@@ -11697,2004 +11202,7 @@ public class Cassandra {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("get_range_slices_result(");
-      boolean first = true;
-
-      sb.append("success:");
-      if (this.success == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.success);
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("ire:");
-      if (this.ire == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.ire);
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("ue:");
-      if (this.ue == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.ue);
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("te:");
-      if (this.te == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.te);
-      }
-      first = false;
-      sb.append(")");
-      return sb.toString();
-    }
-
-    public void validate() throws TException {
-      // check for required fields
-    }
-
-  }
-
-  public static class insert_args implements TBase<insert_args._Fields>, java.io.Serializable, Cloneable, Comparable<insert_args>   {
-    private static final TStruct STRUCT_DESC = new TStruct("insert_args");
-
-    private static final TField KEY_FIELD_DESC = new TField("key", TType.STRING, (short)1);
-    private static final TField COLUMN_PARENT_FIELD_DESC = new TField("column_parent", TType.STRUCT, (short)2);
-    private static final TField COLUMN_FIELD_DESC = new TField("column", TType.STRUCT, (short)3);
-    private static final TField CONSISTENCY_LEVEL_FIELD_DESC = new TField("consistency_level", TType.I32, (short)4);
-
-    public byte[] key;
-    public ColumnParent column_parent;
-    public Column column;
-    /**
-     * 
-     * @see ConsistencyLevel
-     */
-    public ConsistencyLevel consistency_level;
-
-    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-    public enum _Fields implements TFieldIdEnum {
-      KEY((short)1, "key"),
-      COLUMN_PARENT((short)2, "column_parent"),
-      COLUMN((short)3, "column"),
-      /**
-       * 
-       * @see ConsistencyLevel
-       */
-      CONSISTENCY_LEVEL((short)4, "consistency_level");
-
-      private static final Map<Integer, _Fields> byId = new HashMap<Integer, _Fields>();
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-      static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
-          byId.put((int)field._thriftId, field);
-          byName.put(field.getFieldName(), field);
-        }
-      }
-
-      /**
-       * Find the _Fields constant that matches fieldId, or null if its not found.
-       */
-      public static _Fields findByThriftId(int fieldId) {
-        return byId.get(fieldId);
-      }
-
-      /**
-       * 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, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new EnumMap<_Fields, FieldMetaData>(_Fields.class) {{
-      put(_Fields.KEY, new FieldMetaData("key", TFieldRequirementType.REQUIRED, 
-          new FieldValueMetaData(TType.STRING)));
-      put(_Fields.COLUMN_PARENT, new FieldMetaData("column_parent", TFieldRequirementType.REQUIRED, 
-          new StructMetaData(TType.STRUCT, ColumnParent.class)));
-      put(_Fields.COLUMN, new FieldMetaData("column", TFieldRequirementType.REQUIRED, 
-          new StructMetaData(TType.STRUCT, Column.class)));
-      put(_Fields.CONSISTENCY_LEVEL, new FieldMetaData("consistency_level", TFieldRequirementType.REQUIRED, 
-          new EnumMetaData(TType.ENUM, ConsistencyLevel.class)));
-    }});
-
-    static {
-      FieldMetaData.addStructMetaDataMap(insert_args.class, metaDataMap);
-    }
-
-    public insert_args() {
-      this.consistency_level = ConsistencyLevel.ONE;
-
-    }
-
-    public insert_args(
-      byte[] key,
-      ColumnParent column_parent,
-      Column column,
-      ConsistencyLevel consistency_level)
-    {
-      this();
-      this.key = key;
-      this.column_parent = column_parent;
-      this.column = column;
-      this.consistency_level = consistency_level;
-    }
-
-    /**
-     * Performs a deep copy on <i>other</i>.
-     */
-    public insert_args(insert_args other) {
-      if (other.isSetKey()) {
-        this.key = new byte[other.key.length];
-        System.arraycopy(other.key, 0, key, 0, other.key.length);
-      }
-      if (other.isSetColumn_parent()) {
-        this.column_parent = new ColumnParent(other.column_parent);
-      }
-      if (other.isSetColumn()) {
-        this.column = new Column(other.column);
-      }
-      if (other.isSetConsistency_level()) {
-        this.consistency_level = other.consistency_level;
-      }
-    }
-
-    public insert_args deepCopy() {
-      return new insert_args(this);
-    }
-
-    @Deprecated
-    public insert_args clone() {
-      return new insert_args(this);
-    }
-
-    public byte[] getKey() {
-      return this.key;
-    }
-
-    public insert_args setKey(byte[] key) {
-      this.key = key;
-      return this;
-    }
-
-    public void unsetKey() {
-      this.key = null;
-    }
-
-    /** Returns true if field key is set (has been asigned a value) and false otherwise */
-    public boolean isSetKey() {
-      return this.key != null;
-    }
-
-    public void setKeyIsSet(boolean value) {
-      if (!value) {
-        this.key = null;
-      }
-    }
-
-    public ColumnParent getColumn_parent() {
-      return this.column_parent;
-    }
-
-    public insert_args setColumn_parent(ColumnParent column_parent) {
-      this.column_parent = column_parent;
-      return this;
-    }
-
-    public void unsetColumn_parent() {
-      this.column_parent = null;
-    }
-
-    /** Returns true if field column_parent is set (has been asigned a value) and false otherwise */
-    public boolean isSetColumn_parent() {
-      return this.column_parent != null;
-    }
-
-    public void setColumn_parentIsSet(boolean value) {
-      if (!value) {
-        this.column_parent = null;
-      }
-    }
-
-    public Column getColumn() {
-      return this.column;
-    }
-
-    public insert_args setColumn(Column column) {
-      this.column = column;
-      return this;
-    }
-
-    public void unsetColumn() {
-      this.column = null;
-    }
-
-    /** Returns true if field column is set (has been asigned a value) and false otherwise */
-    public boolean isSetColumn() {
-      return this.column != null;
-    }
-
-    public void setColumnIsSet(boolean value) {
-      if (!value) {
-        this.column = null;
-      }
-    }
-
-    /**
-     * 
-     * @see ConsistencyLevel
-     */
-    public ConsistencyLevel getConsistency_level() {
-      return this.consistency_level;
-    }
-
-    /**
-     * 
-     * @see ConsistencyLevel
-     */
-    public insert_args setConsistency_level(ConsistencyLevel consistency_level) {
-      this.consistency_level = consistency_level;
-      return this;
-    }
-
-    public void unsetConsistency_level() {
-      this.consistency_level = null;
-    }
-
-    /** Returns true if field consistency_level is set (has been asigned a value) and false otherwise */
-    public boolean isSetConsistency_level() {
-      return this.consistency_level != null;
-    }
-
-    public void setConsistency_levelIsSet(boolean value) {
-      if (!value) {
-        this.consistency_level = null;
-      }
-    }
-
-    public void setFieldValue(_Fields field, Object value) {
-      switch (field) {
-      case KEY:
-        if (value == null) {
-          unsetKey();
-        } else {
-          setKey((byte[])value);
-        }
-        break;
-
-      case COLUMN_PARENT:
-        if (value == null) {
-          unsetColumn_parent();
-        } else {
-          setColumn_parent((ColumnParent)value);
-        }
-        break;
-
-      case COLUMN:
-        if (value == null) {
-          unsetColumn();
-        } else {
-          setColumn((Column)value);
-        }
-        break;
-
-      case CONSISTENCY_LEVEL:
-        if (value == null) {
-          unsetConsistency_level();
-        } else {
-          setConsistency_level((ConsistencyLevel)value);
-        }
-        break;
-
-      }
-    }
-
-    public void setFieldValue(int fieldID, Object value) {
-      setFieldValue(_Fields.findByThriftIdOrThrow(fieldID), value);
-    }
-
-    public Object getFieldValue(_Fields field) {
-      switch (field) {
-      case KEY:
-        return getKey();
-
-      case COLUMN_PARENT:
-        return getColumn_parent();
-
-      case COLUMN:
-        return getColumn();
-
-      case CONSISTENCY_LEVEL:
-        return getConsistency_level();
-
-      }
-      throw new IllegalStateException();
-    }
-
-    public Object getFieldValue(int fieldId) {
-      return getFieldValue(_Fields.findByThriftIdOrThrow(fieldId));
-    }
-
-    /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
-    public boolean isSet(_Fields field) {
-      switch (field) {
-      case KEY:
-        return isSetKey();
-      case COLUMN_PARENT:
-        return isSetColumn_parent();
-      case COLUMN:
-        return isSetColumn();
-      case CONSISTENCY_LEVEL:
-        return isSetConsistency_level();
-      }
-      throw new IllegalStateException();
-    }
-
-    public boolean isSet(int fieldID) {
-      return isSet(_Fields.findByThriftIdOrThrow(fieldID));
-    }
-
-    @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
-      if (that instanceof insert_args)
-        return this.equals((insert_args)that);
-      return false;
-    }
-
-    public boolean equals(insert_args 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 (!java.util.Arrays.equals(this.key, that.key))
-          return false;
-      }
-
-      boolean this_present_column_parent = true && this.isSetColumn_parent();
-      boolean that_present_column_parent = true && that.isSetColumn_parent();
-      if (this_present_column_parent || that_present_column_parent) {
-        if (!(this_present_column_parent && that_present_column_parent))
-          return false;
-        if (!this.column_parent.equals(that.column_parent))
-          return false;
-      }
-
-      boolean this_present_column = true && this.isSetColumn();
-      boolean that_present_column = true && that.isSetColumn();
-      if (this_present_column || that_present_column) {
-        if (!(this_present_column && that_present_column))
-          return false;
-        if (!this.column.equals(that.column))
-          return false;
-      }
-
-      boolean this_present_consistency_level = true && this.isSetConsistency_level();
-      boolean that_present_consistency_level = true && that.isSetConsistency_level();
-      if (this_present_consistency_level || that_present_consistency_level) {
-        if (!(this_present_consistency_level && that_present_consistency_level))
-          return false;
-        if (!this.consistency_level.equals(that.consistency_level))
-          return false;
-      }
-
-      return true;
-    }
-
-    @Override
-    public int hashCode() {
-      return 0;
-    }
-
-    public int compareTo(insert_args other) {
-      if (!getClass().equals(other.getClass())) {
-        return getClass().getName().compareTo(other.getClass().getName());
-      }
-
-      int lastComparison = 0;
-      insert_args typedOther = (insert_args)other;
-
-      lastComparison = Boolean.valueOf(isSetKey()).compareTo(typedOther.isSetKey());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetKey()) {        lastComparison = TBaseHelper.compareTo(key, typedOther.key);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = Boolean.valueOf(isSetColumn_parent()).compareTo(typedOther.isSetColumn_parent());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetColumn_parent()) {        lastComparison = TBaseHelper.compareTo(column_parent, typedOther.column_parent);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = Boolean.valueOf(isSetColumn()).compareTo(typedOther.isSetColumn());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetColumn()) {        lastComparison = TBaseHelper.compareTo(column, typedOther.column);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = Boolean.valueOf(isSetConsistency_level()).compareTo(typedOther.isSetConsistency_level());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetConsistency_level()) {        lastComparison = TBaseHelper.compareTo(consistency_level, typedOther.consistency_level);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      return 0;
-    }
-
-    public void read(TProtocol iprot) throws TException {
-      TField field;
-      iprot.readStructBegin();
-      while (true)
-      {
-        field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
-          break;
-        }
-        switch (field.id) {
-          case 1: // KEY
-            if (field.type == TType.STRING) {
-              this.key = iprot.readBinary();
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case 2: // COLUMN_PARENT
-            if (field.type == TType.STRUCT) {
-              this.column_parent = new ColumnParent();
-              this.column_parent.read(iprot);
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case 3: // COLUMN
-            if (field.type == TType.STRUCT) {
-              this.column = new Column();
-              this.column.read(iprot);
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case 4: // CONSISTENCY_LEVEL
-            if (field.type == TType.I32) {
-              this.consistency_level = ConsistencyLevel.findByValue(iprot.readI32());
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          default:
-            TProtocolUtil.skip(iprot, field.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-
-      // check for required fields of primitive type, which can't be checked in the validate method
-      validate();
-    }
-
-    public void write(TProtocol oprot) throws TException {
-      validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (this.key != null) {
-        oprot.writeFieldBegin(KEY_FIELD_DESC);
-        oprot.writeBinary(this.key);
-        oprot.writeFieldEnd();
-      }
-      if (this.column_parent != null) {
-        oprot.writeFieldBegin(COLUMN_PARENT_FIELD_DESC);
-        this.column_parent.write(oprot);
-        oprot.writeFieldEnd();
-      }
-      if (this.column != null) {
-        oprot.writeFieldBegin(COLUMN_FIELD_DESC);
-        this.column.write(oprot);
-        oprot.writeFieldEnd();
-      }
-      if (this.consistency_level != null) {
-        oprot.writeFieldBegin(CONSISTENCY_LEVEL_FIELD_DESC);
-        oprot.writeI32(this.consistency_level.getValue());
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-    @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("insert_args(");
-      boolean first = true;
-
-      sb.append("key:");
-      if (this.key == null) {
-        sb.append("null");
-      } else {
-          int __key_size = Math.min(this.key.length, 128);
-          for (int i = 0; i < __key_size; i++) {
-            if (i != 0) sb.append(" ");
-            sb.append(Integer.toHexString(this.key[i]).length() > 1 ? Integer.toHexString(this.key[i]).substring(Integer.toHexString(this.key[i]).length() - 2).toUpperCase() : "0" + Integer.toHexString(this.key[i]).toUpperCase());
-          }
-          if (this.key.length > 128) sb.append(" ...");
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("column_parent:");
-      if (this.column_parent == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.column_parent);
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("column:");
-      if (this.column == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.column);
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("consistency_level:");
-      if (this.consistency_level == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.consistency_level);
-      }
-      first = false;
-      sb.append(")");
-      return sb.toString();
-    }
-
-    public void validate() throws TException {
-      // check for required fields
-      if (key == null) {
-        throw new TProtocolException("Required field 'key' was not present! Struct: " + toString());
-      }
-      if (column_parent == null) {
-        throw new TProtocolException("Required field 'column_parent' was not present! Struct: " + toString());
-      }
-      if (column == null) {
-        throw new TProtocolException("Required field 'column' was not present! Struct: " + toString());
-      }
-      if (consistency_level == null) {
-        throw new TProtocolException("Required field 'consistency_level' was not present! Struct: " + toString());
-      }
-    }
-
-  }
-
-  public static class insert_result implements TBase<insert_result._Fields>, java.io.Serializable, Cloneable, Comparable<insert_result>   {
-    private static final TStruct STRUCT_DESC = new TStruct("insert_result");
-
-    private static final TField IRE_FIELD_DESC = new TField("ire", TType.STRUCT, (short)1);
-    private static final TField UE_FIELD_DESC = new TField("ue", TType.STRUCT, (short)2);
-    private static final TField TE_FIELD_DESC = new TField("te", TType.STRUCT, (short)3);
-
-    public InvalidRequestException ire;
-    public UnavailableException ue;
-    public TimedOutException te;
-
-    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-    public enum _Fields implements TFieldIdEnum {
-      IRE((short)1, "ire"),
-      UE((short)2, "ue"),
-      TE((short)3, "te");
-
-      private static final Map<Integer, _Fields> byId = new HashMap<Integer, _Fields>();
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-      static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
-          byId.put((int)field._thriftId, field);
-          byName.put(field.getFieldName(), field);
-        }
-      }
-
-      /**
-       * Find the _Fields constant that matches fieldId, or null if its not found.
-       */
-      public static _Fields findByThriftId(int fieldId) {
-        return byId.get(fieldId);
-      }
-
-      /**
-       * 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;
-      }
-

[... 1577 lines stripped ...]


Mime
View raw message