cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r809793 [2/3] - in /incubator/cassandra/trunk: interface/ interface/gen-java/org/apache/cassandra/service/ src/java/org/apache/cassandra/db/ src/java/org/apache/cassandra/service/ test/system/
Date Tue, 01 Sep 2009 01:52:03 GMT
Modified: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java?rev=809793&r1=809792&r2=809793&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java Tue Sep  1 01:52:03 2009
@@ -45,24 +45,24 @@
 
   public interface Iface {
 
-    public List<ColumnOrSuperColumn> get_slice(String keyspace, String key, ColumnParent column_parent, SlicePredicate predicate, int consistency_level) throws InvalidRequestException, NotFoundException, TException;
-
-    public Map<String,List<ColumnOrSuperColumn>> multiget_slice(String keyspace, List<String> keys, ColumnParent column_parent, SlicePredicate predicate, int consistency_level) throws InvalidRequestException, TException;
-
     public ColumnOrSuperColumn get(String keyspace, String key, ColumnPath column_path, int consistency_level) throws InvalidRequestException, NotFoundException, TException;
 
+    public List<ColumnOrSuperColumn> get_slice(String keyspace, String key, ColumnParent column_parent, SlicePredicate predicate, int consistency_level) throws InvalidRequestException, NotFoundException, TException;
+
     public Map<String,ColumnOrSuperColumn> multiget(String keyspace, List<String> keys, ColumnPath column_path, int consistency_level) throws InvalidRequestException, TException;
 
+    public Map<String,List<ColumnOrSuperColumn>> multiget_slice(String keyspace, List<String> keys, ColumnParent column_parent, SlicePredicate predicate, int consistency_level) throws InvalidRequestException, TException;
+
     public int get_count(String keyspace, String key, ColumnParent column_parent, int consistency_level) throws InvalidRequestException, TException;
 
+    public List<String> get_key_range(String keyspace, String column_family, String start, String finish, int count, int consistency_level) throws InvalidRequestException, TException;
+
     public void insert(String keyspace, String key, ColumnPath column_path, byte[] value, long timestamp, int consistency_level) throws InvalidRequestException, UnavailableException, TException;
 
-    public void batch_insert(String keyspace, BatchMutation batch_mutation, int consistency_level) throws InvalidRequestException, UnavailableException, TException;
+    public void batch_insert(String keyspace, String key, Map<String,List<ColumnOrSuperColumn>> cfmap, int consistency_level) throws InvalidRequestException, UnavailableException, TException;
 
     public void remove(String keyspace, String key, ColumnPath column_path, long timestamp, int consistency_level) throws InvalidRequestException, UnavailableException, TException;
 
-    public List<String> get_key_range(String keyspace, String column_family, String start, String finish, int count, int consistency_level) throws InvalidRequestException, TException;
-
     public String get_string_property(String property) throws TException;
 
     public List<String> get_string_list_property(String property) throws TException;
@@ -98,27 +98,26 @@
       return this.oprot_;
     }
 
-    public List<ColumnOrSuperColumn> get_slice(String keyspace, String key, ColumnParent column_parent, SlicePredicate predicate, int consistency_level) throws InvalidRequestException, NotFoundException, TException
+    public ColumnOrSuperColumn get(String keyspace, String key, ColumnPath column_path, int consistency_level) throws InvalidRequestException, NotFoundException, TException
     {
-      send_get_slice(keyspace, key, column_parent, predicate, consistency_level);
-      return recv_get_slice();
+      send_get(keyspace, key, column_path, consistency_level);
+      return recv_get();
     }
 
-    public void send_get_slice(String keyspace, String key, ColumnParent column_parent, SlicePredicate predicate, int consistency_level) throws TException
+    public void send_get(String keyspace, String key, ColumnPath column_path, int consistency_level) throws TException
     {
-      oprot_.writeMessageBegin(new TMessage("get_slice", TMessageType.CALL, seqid_));
-      get_slice_args args = new get_slice_args();
+      oprot_.writeMessageBegin(new TMessage("get", TMessageType.CALL, seqid_));
+      get_args args = new get_args();
       args.keyspace = keyspace;
       args.key = key;
-      args.column_parent = column_parent;
-      args.predicate = predicate;
+      args.column_path = column_path;
       args.consistency_level = consistency_level;
       args.write(oprot_);
       oprot_.writeMessageEnd();
       oprot_.getTransport().flush();
     }
 
-    public List<ColumnOrSuperColumn> recv_get_slice() throws InvalidRequestException, NotFoundException, TException
+    public ColumnOrSuperColumn recv_get() throws InvalidRequestException, NotFoundException, TException
     {
       TMessage msg = iprot_.readMessageBegin();
       if (msg.type == TMessageType.EXCEPTION) {
@@ -126,7 +125,7 @@
         iprot_.readMessageEnd();
         throw x;
       }
-      get_slice_result result = new get_slice_result();
+      get_result result = new get_result();
       result.read(iprot_);
       iprot_.readMessageEnd();
       if (result.isSetSuccess()) {
@@ -138,21 +137,21 @@
       if (result.nfe != null) {
         throw result.nfe;
       }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "get_slice failed: unknown result");
+      throw new TApplicationException(TApplicationException.MISSING_RESULT, "get failed: unknown result");
     }
 
-    public Map<String,List<ColumnOrSuperColumn>> multiget_slice(String keyspace, List<String> keys, ColumnParent column_parent, SlicePredicate predicate, int consistency_level) throws InvalidRequestException, TException
+    public List<ColumnOrSuperColumn> get_slice(String keyspace, String key, ColumnParent column_parent, SlicePredicate predicate, int consistency_level) throws InvalidRequestException, NotFoundException, TException
     {
-      send_multiget_slice(keyspace, keys, column_parent, predicate, consistency_level);
-      return recv_multiget_slice();
+      send_get_slice(keyspace, key, column_parent, predicate, consistency_level);
+      return recv_get_slice();
     }
 
-    public void send_multiget_slice(String keyspace, List<String> keys, ColumnParent column_parent, SlicePredicate predicate, int consistency_level) throws TException
+    public void send_get_slice(String keyspace, String key, ColumnParent column_parent, SlicePredicate predicate, int consistency_level) throws TException
     {
-      oprot_.writeMessageBegin(new TMessage("multiget_slice", TMessageType.CALL, seqid_));
-      multiget_slice_args args = new multiget_slice_args();
+      oprot_.writeMessageBegin(new TMessage("get_slice", TMessageType.CALL, seqid_));
+      get_slice_args args = new get_slice_args();
       args.keyspace = keyspace;
-      args.keys = keys;
+      args.key = key;
       args.column_parent = column_parent;
       args.predicate = predicate;
       args.consistency_level = consistency_level;
@@ -161,7 +160,7 @@
       oprot_.getTransport().flush();
     }
 
-    public Map<String,List<ColumnOrSuperColumn>> recv_multiget_slice() throws InvalidRequestException, TException
+    public List<ColumnOrSuperColumn> recv_get_slice() throws InvalidRequestException, NotFoundException, TException
     {
       TMessage msg = iprot_.readMessageBegin();
       if (msg.type == TMessageType.EXCEPTION) {
@@ -169,7 +168,7 @@
         iprot_.readMessageEnd();
         throw x;
       }
-      multiget_slice_result result = new multiget_slice_result();
+      get_slice_result result = new get_slice_result();
       result.read(iprot_);
       iprot_.readMessageEnd();
       if (result.isSetSuccess()) {
@@ -178,21 +177,24 @@
       if (result.ire != null) {
         throw result.ire;
       }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "multiget_slice failed: unknown result");
+      if (result.nfe != null) {
+        throw result.nfe;
+      }
+      throw new TApplicationException(TApplicationException.MISSING_RESULT, "get_slice failed: unknown result");
     }
 
-    public ColumnOrSuperColumn get(String keyspace, String key, ColumnPath column_path, int consistency_level) throws InvalidRequestException, NotFoundException, TException
+    public Map<String,ColumnOrSuperColumn> multiget(String keyspace, List<String> keys, ColumnPath column_path, int consistency_level) throws InvalidRequestException, TException
     {
-      send_get(keyspace, key, column_path, consistency_level);
-      return recv_get();
+      send_multiget(keyspace, keys, column_path, consistency_level);
+      return recv_multiget();
     }
 
-    public void send_get(String keyspace, String key, ColumnPath column_path, int consistency_level) throws TException
+    public void send_multiget(String keyspace, List<String> keys, ColumnPath column_path, int consistency_level) throws TException
     {
-      oprot_.writeMessageBegin(new TMessage("get", TMessageType.CALL, seqid_));
-      get_args args = new get_args();
+      oprot_.writeMessageBegin(new TMessage("multiget", TMessageType.CALL, seqid_));
+      multiget_args args = new multiget_args();
       args.keyspace = keyspace;
-      args.key = key;
+      args.keys = keys;
       args.column_path = column_path;
       args.consistency_level = consistency_level;
       args.write(oprot_);
@@ -200,7 +202,7 @@
       oprot_.getTransport().flush();
     }
 
-    public ColumnOrSuperColumn recv_get() throws InvalidRequestException, NotFoundException, TException
+    public Map<String,ColumnOrSuperColumn> recv_multiget() throws InvalidRequestException, TException
     {
       TMessage msg = iprot_.readMessageBegin();
       if (msg.type == TMessageType.EXCEPTION) {
@@ -208,7 +210,7 @@
         iprot_.readMessageEnd();
         throw x;
       }
-      get_result result = new get_result();
+      multiget_result result = new multiget_result();
       result.read(iprot_);
       iprot_.readMessageEnd();
       if (result.isSetSuccess()) {
@@ -217,32 +219,30 @@
       if (result.ire != null) {
         throw result.ire;
       }
-      if (result.nfe != null) {
-        throw result.nfe;
-      }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "get failed: unknown result");
+      throw new TApplicationException(TApplicationException.MISSING_RESULT, "multiget failed: unknown result");
     }
 
-    public Map<String,ColumnOrSuperColumn> multiget(String keyspace, List<String> keys, ColumnPath column_path, int consistency_level) throws InvalidRequestException, TException
+    public Map<String,List<ColumnOrSuperColumn>> multiget_slice(String keyspace, List<String> keys, ColumnParent column_parent, SlicePredicate predicate, int consistency_level) throws InvalidRequestException, TException
     {
-      send_multiget(keyspace, keys, column_path, consistency_level);
-      return recv_multiget();
+      send_multiget_slice(keyspace, keys, column_parent, predicate, consistency_level);
+      return recv_multiget_slice();
     }
 
-    public void send_multiget(String keyspace, List<String> keys, ColumnPath column_path, int consistency_level) throws TException
+    public void send_multiget_slice(String keyspace, List<String> keys, ColumnParent column_parent, SlicePredicate predicate, int consistency_level) throws TException
     {
-      oprot_.writeMessageBegin(new TMessage("multiget", TMessageType.CALL, seqid_));
-      multiget_args args = new multiget_args();
+      oprot_.writeMessageBegin(new TMessage("multiget_slice", TMessageType.CALL, seqid_));
+      multiget_slice_args args = new multiget_slice_args();
       args.keyspace = keyspace;
       args.keys = keys;
-      args.column_path = column_path;
+      args.column_parent = column_parent;
+      args.predicate = predicate;
       args.consistency_level = consistency_level;
       args.write(oprot_);
       oprot_.writeMessageEnd();
       oprot_.getTransport().flush();
     }
 
-    public Map<String,ColumnOrSuperColumn> recv_multiget() throws InvalidRequestException, TException
+    public Map<String,List<ColumnOrSuperColumn>> recv_multiget_slice() throws InvalidRequestException, TException
     {
       TMessage msg = iprot_.readMessageBegin();
       if (msg.type == TMessageType.EXCEPTION) {
@@ -250,7 +250,7 @@
         iprot_.readMessageEnd();
         throw x;
       }
-      multiget_result result = new multiget_result();
+      multiget_slice_result result = new multiget_slice_result();
       result.read(iprot_);
       iprot_.readMessageEnd();
       if (result.isSetSuccess()) {
@@ -259,7 +259,7 @@
       if (result.ire != null) {
         throw result.ire;
       }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "multiget failed: unknown result");
+      throw new TApplicationException(TApplicationException.MISSING_RESULT, "multiget_slice failed: unknown result");
     }
 
     public int get_count(String keyspace, String key, ColumnParent column_parent, int consistency_level) throws InvalidRequestException, TException
@@ -301,6 +301,47 @@
       throw new TApplicationException(TApplicationException.MISSING_RESULT, "get_count failed: unknown result");
     }
 
+    public List<String> get_key_range(String keyspace, String column_family, String start, String finish, int count, int consistency_level) throws InvalidRequestException, TException
+    {
+      send_get_key_range(keyspace, column_family, start, finish, count, consistency_level);
+      return recv_get_key_range();
+    }
+
+    public void send_get_key_range(String keyspace, String column_family, String start, String finish, int count, int consistency_level) throws TException
+    {
+      oprot_.writeMessageBegin(new TMessage("get_key_range", TMessageType.CALL, seqid_));
+      get_key_range_args args = new get_key_range_args();
+      args.keyspace = keyspace;
+      args.column_family = column_family;
+      args.start = start;
+      args.finish = finish;
+      args.count = count;
+      args.consistency_level = consistency_level;
+      args.write(oprot_);
+      oprot_.writeMessageEnd();
+      oprot_.getTransport().flush();
+    }
+
+    public List<String> recv_get_key_range() throws InvalidRequestException, TException
+    {
+      TMessage msg = iprot_.readMessageBegin();
+      if (msg.type == TMessageType.EXCEPTION) {
+        TApplicationException x = TApplicationException.read(iprot_);
+        iprot_.readMessageEnd();
+        throw x;
+      }
+      get_key_range_result result = new get_key_range_result();
+      result.read(iprot_);
+      iprot_.readMessageEnd();
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.ire != null) {
+        throw result.ire;
+      }
+      throw new TApplicationException(TApplicationException.MISSING_RESULT, "get_key_range failed: unknown result");
+    }
+
     public void insert(String keyspace, String key, ColumnPath column_path, byte[] value, long timestamp, int consistency_level) throws InvalidRequestException, UnavailableException, TException
     {
       send_insert(keyspace, key, column_path, value, timestamp, consistency_level);
@@ -342,18 +383,19 @@
       return;
     }
 
-    public void batch_insert(String keyspace, BatchMutation batch_mutation, int consistency_level) throws InvalidRequestException, UnavailableException, TException
+    public void batch_insert(String keyspace, String key, Map<String,List<ColumnOrSuperColumn>> cfmap, int consistency_level) throws InvalidRequestException, UnavailableException, TException
     {
-      send_batch_insert(keyspace, batch_mutation, consistency_level);
+      send_batch_insert(keyspace, key, cfmap, consistency_level);
       recv_batch_insert();
     }
 
-    public void send_batch_insert(String keyspace, BatchMutation batch_mutation, int consistency_level) throws TException
+    public void send_batch_insert(String keyspace, String key, Map<String,List<ColumnOrSuperColumn>> cfmap, int consistency_level) throws TException
     {
       oprot_.writeMessageBegin(new TMessage("batch_insert", TMessageType.CALL, seqid_));
       batch_insert_args args = new batch_insert_args();
       args.keyspace = keyspace;
-      args.batch_mutation = batch_mutation;
+      args.key = key;
+      args.cfmap = cfmap;
       args.consistency_level = consistency_level;
       args.write(oprot_);
       oprot_.writeMessageEnd();
@@ -420,47 +462,6 @@
       return;
     }
 
-    public List<String> get_key_range(String keyspace, String column_family, String start, String finish, int count, int consistency_level) throws InvalidRequestException, TException
-    {
-      send_get_key_range(keyspace, column_family, start, finish, count, consistency_level);
-      return recv_get_key_range();
-    }
-
-    public void send_get_key_range(String keyspace, String column_family, String start, String finish, int count, int consistency_level) throws TException
-    {
-      oprot_.writeMessageBegin(new TMessage("get_key_range", TMessageType.CALL, seqid_));
-      get_key_range_args args = new get_key_range_args();
-      args.keyspace = keyspace;
-      args.column_family = column_family;
-      args.start = start;
-      args.finish = finish;
-      args.count = count;
-      args.consistency_level = consistency_level;
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
-    }
-
-    public List<String> recv_get_key_range() throws InvalidRequestException, TException
-    {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
-      get_key_range_result result = new get_key_range_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.ire != null) {
-        throw result.ire;
-      }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "get_key_range failed: unknown result");
-    }
-
     public String get_string_property(String property) throws TException
     {
       send_get_string_property(property);
@@ -569,15 +570,15 @@
     public Processor(Iface iface)
     {
       iface_ = iface;
-      processMap_.put("get_slice", new get_slice());
-      processMap_.put("multiget_slice", new multiget_slice());
       processMap_.put("get", new get());
+      processMap_.put("get_slice", new get_slice());
       processMap_.put("multiget", new multiget());
+      processMap_.put("multiget_slice", new multiget_slice());
       processMap_.put("get_count", new get_count());
+      processMap_.put("get_key_range", new get_key_range());
       processMap_.put("insert", new insert());
       processMap_.put("batch_insert", new batch_insert());
       processMap_.put("remove", new remove());
-      processMap_.put("get_key_range", new get_key_range());
       processMap_.put("get_string_property", new get_string_property());
       processMap_.put("get_string_list_property", new get_string_list_property());
       processMap_.put("describe_keyspace", new describe_keyspace());
@@ -608,57 +609,29 @@
       return true;
     }
 
-    private class get_slice implements ProcessFunction {
+    private class get implements ProcessFunction {
       public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
       {
-        get_slice_args args = new get_slice_args();
+        get_args args = new get_args();
         args.read(iprot);
         iprot.readMessageEnd();
-        get_slice_result result = new get_slice_result();
+        get_result result = new get_result();
         try {
-          result.success = iface_.get_slice(args.keyspace, args.key, args.column_parent, args.predicate, args.consistency_level);
+          result.success = iface_.get(args.keyspace, args.key, args.column_path, args.consistency_level);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
         } catch (NotFoundException nfe) {
           result.nfe = nfe;
         } catch (Throwable th) {
-          LOGGER.error("Internal error processing get_slice", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing get_slice");
-          oprot.writeMessageBegin(new TMessage("get_slice", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        oprot.writeMessageBegin(new TMessage("get_slice", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
-      }
-
-    }
-
-    private class multiget_slice implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        multiget_slice_args args = new multiget_slice_args();
-        args.read(iprot);
-        iprot.readMessageEnd();
-        multiget_slice_result result = new multiget_slice_result();
-        try {
-          result.success = iface_.multiget_slice(args.keyspace, args.keys, args.column_parent, args.predicate, args.consistency_level);
-        } catch (InvalidRequestException ire) {
-          result.ire = ire;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing multiget_slice", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing multiget_slice");
-          oprot.writeMessageBegin(new TMessage("multiget_slice", TMessageType.EXCEPTION, seqid));
+          LOGGER.error("Internal error processing get", th);
+          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing get");
+          oprot.writeMessageBegin(new TMessage("get", TMessageType.EXCEPTION, seqid));
           x.write(oprot);
           oprot.writeMessageEnd();
           oprot.getTransport().flush();
           return;
         }
-        oprot.writeMessageBegin(new TMessage("multiget_slice", TMessageType.REPLY, seqid));
+        oprot.writeMessageBegin(new TMessage("get", TMessageType.REPLY, seqid));
         result.write(oprot);
         oprot.writeMessageEnd();
         oprot.getTransport().flush();
@@ -666,29 +639,29 @@
 
     }
 
-    private class get implements ProcessFunction {
+    private class get_slice implements ProcessFunction {
       public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
       {
-        get_args args = new get_args();
+        get_slice_args args = new get_slice_args();
         args.read(iprot);
         iprot.readMessageEnd();
-        get_result result = new get_result();
+        get_slice_result result = new get_slice_result();
         try {
-          result.success = iface_.get(args.keyspace, args.key, args.column_path, args.consistency_level);
+          result.success = iface_.get_slice(args.keyspace, args.key, args.column_parent, args.predicate, args.consistency_level);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
         } catch (NotFoundException nfe) {
           result.nfe = nfe;
         } catch (Throwable th) {
-          LOGGER.error("Internal error processing get", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing get");
-          oprot.writeMessageBegin(new TMessage("get", TMessageType.EXCEPTION, seqid));
+          LOGGER.error("Internal error processing get_slice", th);
+          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing get_slice");
+          oprot.writeMessageBegin(new TMessage("get_slice", TMessageType.EXCEPTION, seqid));
           x.write(oprot);
           oprot.writeMessageEnd();
           oprot.getTransport().flush();
           return;
         }
-        oprot.writeMessageBegin(new TMessage("get", TMessageType.REPLY, seqid));
+        oprot.writeMessageBegin(new TMessage("get_slice", TMessageType.REPLY, seqid));
         result.write(oprot);
         oprot.writeMessageEnd();
         oprot.getTransport().flush();
@@ -724,15 +697,43 @@
 
     }
 
-    private class get_count implements ProcessFunction {
+    private class multiget_slice implements ProcessFunction {
       public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
       {
-        get_count_args args = new get_count_args();
+        multiget_slice_args args = new multiget_slice_args();
         args.read(iprot);
         iprot.readMessageEnd();
-        get_count_result result = new get_count_result();
+        multiget_slice_result result = new multiget_slice_result();
         try {
-          result.success = iface_.get_count(args.keyspace, args.key, args.column_parent, args.consistency_level);
+          result.success = iface_.multiget_slice(args.keyspace, args.keys, args.column_parent, args.predicate, args.consistency_level);
+        } catch (InvalidRequestException ire) {
+          result.ire = ire;
+        } catch (Throwable th) {
+          LOGGER.error("Internal error processing multiget_slice", th);
+          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing multiget_slice");
+          oprot.writeMessageBegin(new TMessage("multiget_slice", TMessageType.EXCEPTION, seqid));
+          x.write(oprot);
+          oprot.writeMessageEnd();
+          oprot.getTransport().flush();
+          return;
+        }
+        oprot.writeMessageBegin(new TMessage("multiget_slice", TMessageType.REPLY, seqid));
+        result.write(oprot);
+        oprot.writeMessageEnd();
+        oprot.getTransport().flush();
+      }
+
+    }
+
+    private class get_count implements ProcessFunction {
+      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
+      {
+        get_count_args args = new get_count_args();
+        args.read(iprot);
+        iprot.readMessageEnd();
+        get_count_result result = new get_count_result();
+        try {
+          result.success = iface_.get_count(args.keyspace, args.key, args.column_parent, args.consistency_level);
           result.setSuccessIsSet(true);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
@@ -753,6 +754,34 @@
 
     }
 
+    private class get_key_range implements ProcessFunction {
+      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
+      {
+        get_key_range_args args = new get_key_range_args();
+        args.read(iprot);
+        iprot.readMessageEnd();
+        get_key_range_result result = new get_key_range_result();
+        try {
+          result.success = iface_.get_key_range(args.keyspace, args.column_family, args.start, args.finish, args.count, args.consistency_level);
+        } catch (InvalidRequestException ire) {
+          result.ire = ire;
+        } catch (Throwable th) {
+          LOGGER.error("Internal error processing get_key_range", th);
+          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing get_key_range");
+          oprot.writeMessageBegin(new TMessage("get_key_range", TMessageType.EXCEPTION, seqid));
+          x.write(oprot);
+          oprot.writeMessageEnd();
+          oprot.getTransport().flush();
+          return;
+        }
+        oprot.writeMessageBegin(new TMessage("get_key_range", TMessageType.REPLY, seqid));
+        result.write(oprot);
+        oprot.writeMessageEnd();
+        oprot.getTransport().flush();
+      }
+
+    }
+
     private class insert implements ProcessFunction {
       public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
       {
@@ -791,7 +820,7 @@
         iprot.readMessageEnd();
         batch_insert_result result = new batch_insert_result();
         try {
-          iface_.batch_insert(args.keyspace, args.batch_mutation, args.consistency_level);
+          iface_.batch_insert(args.keyspace, args.key, args.cfmap, args.consistency_level);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
         } catch (UnavailableException ue) {
@@ -843,34 +872,6 @@
 
     }
 
-    private class get_key_range implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        get_key_range_args args = new get_key_range_args();
-        args.read(iprot);
-        iprot.readMessageEnd();
-        get_key_range_result result = new get_key_range_result();
-        try {
-          result.success = iface_.get_key_range(args.keyspace, args.column_family, args.start, args.finish, args.count, args.consistency_level);
-        } catch (InvalidRequestException ire) {
-          result.ire = ire;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing get_key_range", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing get_key_range");
-          oprot.writeMessageBegin(new TMessage("get_key_range", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        oprot.writeMessageBegin(new TMessage("get_key_range", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
-      }
-
-    }
-
     private class get_string_property implements ProcessFunction {
       public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
       {
@@ -933,28 +934,25 @@
 
   }
 
-  public static class get_slice_args implements TBase, java.io.Serializable, Cloneable, Comparable<get_slice_args>   {
-    private static final TStruct STRUCT_DESC = new TStruct("get_slice_args");
+  public static class get_args implements TBase, java.io.Serializable, Cloneable, Comparable<get_args>   {
+    private static final TStruct STRUCT_DESC = new TStruct("get_args");
     private static final TField KEYSPACE_FIELD_DESC = new TField("keyspace", TType.STRING, (short)1);
     private static final TField KEY_FIELD_DESC = new TField("key", TType.STRING, (short)2);
-    private static final TField COLUMN_PARENT_FIELD_DESC = new TField("column_parent", TType.STRUCT, (short)3);
-    private static final TField PREDICATE_FIELD_DESC = new TField("predicate", TType.STRUCT, (short)4);
-    private static final TField CONSISTENCY_LEVEL_FIELD_DESC = new TField("consistency_level", TType.I32, (short)5);
+    private static final TField COLUMN_PATH_FIELD_DESC = new TField("column_path", TType.STRUCT, (short)3);
+    private static final TField CONSISTENCY_LEVEL_FIELD_DESC = new TField("consistency_level", TType.I32, (short)4);
 
     public String keyspace;
     public static final int KEYSPACE = 1;
     public String key;
     public static final int KEY = 2;
-    public ColumnParent column_parent;
-    public static final int COLUMN_PARENT = 3;
-    public SlicePredicate predicate;
-    public static final int PREDICATE = 4;
+    public ColumnPath column_path;
+    public static final int COLUMN_PATH = 3;
     /**
      * 
      * @see ConsistencyLevel
      */
     public int consistency_level;
-    public static final int CONSISTENCY_LEVEL = 5;
+    public static final int CONSISTENCY_LEVEL = 4;
 
     // isset id assignments
     private static final int __CONSISTENCY_LEVEL_ISSET_ID = 0;
@@ -965,35 +963,31 @@
           new FieldValueMetaData(TType.STRING)));
       put(KEY, new FieldMetaData("key", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
-      put(COLUMN_PARENT, new FieldMetaData("column_parent", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, ColumnParent.class)));
-      put(PREDICATE, new FieldMetaData("predicate", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, SlicePredicate.class)));
+      put(COLUMN_PATH, new FieldMetaData("column_path", TFieldRequirementType.DEFAULT, 
+          new StructMetaData(TType.STRUCT, ColumnPath.class)));
       put(CONSISTENCY_LEVEL, new FieldMetaData("consistency_level", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.I32)));
     }});
 
     static {
-      FieldMetaData.addStructMetaDataMap(get_slice_args.class, metaDataMap);
+      FieldMetaData.addStructMetaDataMap(get_args.class, metaDataMap);
     }
 
-    public get_slice_args() {
+    public get_args() {
       this.consistency_level = 1;
 
     }
 
-    public get_slice_args(
+    public get_args(
       String keyspace,
       String key,
-      ColumnParent column_parent,
-      SlicePredicate predicate,
+      ColumnPath column_path,
       int consistency_level)
     {
       this();
       this.keyspace = keyspace;
       this.key = key;
-      this.column_parent = column_parent;
-      this.predicate = predicate;
+      this.column_path = column_path;
       this.consistency_level = consistency_level;
       setConsistency_levelIsSet(true);
     }
@@ -1001,7 +995,7 @@
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public get_slice_args(get_slice_args other) {
+    public get_args(get_args other) {
       __isset_bit_vector.clear();
       __isset_bit_vector.or(other.__isset_bit_vector);
       if (other.isSetKeyspace()) {
@@ -1010,25 +1004,22 @@
       if (other.isSetKey()) {
         this.key = other.key;
       }
-      if (other.isSetColumn_parent()) {
-        this.column_parent = new ColumnParent(other.column_parent);
-      }
-      if (other.isSetPredicate()) {
-        this.predicate = new SlicePredicate(other.predicate);
+      if (other.isSetColumn_path()) {
+        this.column_path = new ColumnPath(other.column_path);
       }
       this.consistency_level = other.consistency_level;
     }
 
     @Override
-    public get_slice_args clone() {
-      return new get_slice_args(this);
+    public get_args clone() {
+      return new get_args(this);
     }
 
     public String getKeyspace() {
       return this.keyspace;
     }
 
-    public get_slice_args setKeyspace(String keyspace) {
+    public get_args setKeyspace(String keyspace) {
       this.keyspace = keyspace;
       return this;
     }
@@ -1052,7 +1043,7 @@
       return this.key;
     }
 
-    public get_slice_args setKey(String key) {
+    public get_args setKey(String key) {
       this.key = key;
       return this;
     }
@@ -1072,51 +1063,27 @@
       }
     }
 
-    public ColumnParent getColumn_parent() {
-      return this.column_parent;
-    }
-
-    public get_slice_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 SlicePredicate getPredicate() {
-      return this.predicate;
+    public ColumnPath getColumn_path() {
+      return this.column_path;
     }
 
-    public get_slice_args setPredicate(SlicePredicate predicate) {
-      this.predicate = predicate;
+    public get_args setColumn_path(ColumnPath column_path) {
+      this.column_path = column_path;
       return this;
     }
 
-    public void unsetPredicate() {
-      this.predicate = null;
+    public void unsetColumn_path() {
+      this.column_path = 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_path is set (has been asigned a value) and false otherwise
+    public boolean isSetColumn_path() {
+      return this.column_path != null;
     }
 
-    public void setPredicateIsSet(boolean value) {
+    public void setColumn_pathIsSet(boolean value) {
       if (!value) {
-        this.predicate = null;
+        this.column_path = null;
       }
     }
 
@@ -1132,7 +1099,7 @@
      * 
      * @see ConsistencyLevel
      */
-    public get_slice_args setConsistency_level(int consistency_level) {
+    public get_args setConsistency_level(int consistency_level) {
       this.consistency_level = consistency_level;
       setConsistency_levelIsSet(true);
       return this;
@@ -1169,19 +1136,11 @@
         }
         break;
 
-      case COLUMN_PARENT:
-        if (value == null) {
-          unsetColumn_parent();
-        } else {
-          setColumn_parent((ColumnParent)value);
-        }
-        break;
-
-      case PREDICATE:
+      case COLUMN_PATH:
         if (value == null) {
-          unsetPredicate();
+          unsetColumn_path();
         } else {
-          setPredicate((SlicePredicate)value);
+          setColumn_path((ColumnPath)value);
         }
         break;
 
@@ -1206,11 +1165,8 @@
       case KEY:
         return getKey();
 
-      case COLUMN_PARENT:
-        return getColumn_parent();
-
-      case PREDICATE:
-        return getPredicate();
+      case COLUMN_PATH:
+        return getColumn_path();
 
       case CONSISTENCY_LEVEL:
         return getConsistency_level();
@@ -1227,10 +1183,8 @@
         return isSetKeyspace();
       case KEY:
         return isSetKey();
-      case COLUMN_PARENT:
-        return isSetColumn_parent();
-      case PREDICATE:
-        return isSetPredicate();
+      case COLUMN_PATH:
+        return isSetColumn_path();
       case CONSISTENCY_LEVEL:
         return isSetConsistency_level();
       default:
@@ -1242,12 +1196,12 @@
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof get_slice_args)
-        return this.equals((get_slice_args)that);
+      if (that instanceof get_args)
+        return this.equals((get_args)that);
       return false;
     }
 
-    public boolean equals(get_slice_args that) {
+    public boolean equals(get_args that) {
       if (that == null)
         return false;
 
@@ -1269,21 +1223,12 @@
           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_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_path = true && this.isSetColumn_path();
+      boolean that_present_column_path = true && that.isSetColumn_path();
+      if (this_present_column_path || that_present_column_path) {
+        if (!(this_present_column_path && that_present_column_path))
           return false;
-        if (!this.predicate.equals(that.predicate))
+        if (!this.column_path.equals(that.column_path))
           return false;
       }
 
@@ -1304,13 +1249,13 @@
       return 0;
     }
 
-    public int compareTo(get_slice_args other) {
+    public int compareTo(get_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      get_slice_args typedOther = (get_slice_args)other;
+      get_args typedOther = (get_args)other;
 
       lastComparison = Boolean.valueOf(isSetKeyspace()).compareTo(isSetKeyspace());
       if (lastComparison != 0) {
@@ -1328,19 +1273,11 @@
       if (lastComparison != 0) {
         return lastComparison;
       }
-      lastComparison = Boolean.valueOf(isSetColumn_parent()).compareTo(isSetColumn_parent());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      lastComparison = TBaseHelper.compareTo(column_parent, typedOther.column_parent);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      lastComparison = Boolean.valueOf(isSetPredicate()).compareTo(isSetPredicate());
+      lastComparison = Boolean.valueOf(isSetColumn_path()).compareTo(isSetColumn_path());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      lastComparison = TBaseHelper.compareTo(predicate, typedOther.predicate);
+      lastComparison = TBaseHelper.compareTo(column_path, typedOther.column_path);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1380,18 +1317,10 @@
               TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case COLUMN_PARENT:
+          case COLUMN_PATH:
             if (field.type == TType.STRUCT) {
-              this.column_parent = new ColumnParent();
-              this.column_parent.read(iprot);
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case PREDICATE:
-            if (field.type == TType.STRUCT) {
-              this.predicate = new SlicePredicate();
-              this.predicate.read(iprot);
+              this.column_path = new ColumnPath();
+              this.column_path.read(iprot);
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
@@ -1431,14 +1360,9 @@
         oprot.writeString(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);
+      if (this.column_path != null) {
+        oprot.writeFieldBegin(COLUMN_PATH_FIELD_DESC);
+        this.column_path.write(oprot);
         oprot.writeFieldEnd();
       }
       oprot.writeFieldBegin(CONSISTENCY_LEVEL_FIELD_DESC);
@@ -1450,7 +1374,7 @@
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("get_slice_args(");
+      StringBuilder sb = new StringBuilder("get_args(");
       boolean first = true;
 
       sb.append("keyspace:");
@@ -1469,19 +1393,11 @@
       }
       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("predicate:");
-      if (this.predicate == null) {
+      sb.append("column_path:");
+      if (this.column_path == null) {
         sb.append("null");
       } else {
-        sb.append(this.predicate);
+        sb.append(this.column_path);
       }
       first = false;
       if (!first) sb.append(", ");
@@ -1510,13 +1426,13 @@
 
   }
 
-  public static class get_slice_result implements TBase, java.io.Serializable, Cloneable, Comparable<get_slice_result>   {
-    private static final TStruct STRUCT_DESC = new TStruct("get_slice_result");
-    private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.LIST, (short)0);
+  public static class get_result implements TBase, java.io.Serializable, Cloneable, Comparable<get_result>   {
+    private static final TStruct STRUCT_DESC = new TStruct("get_result");
+    private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.STRUCT, (short)0);
     private static final TField IRE_FIELD_DESC = new TField("ire", TType.STRUCT, (short)1);
     private static final TField NFE_FIELD_DESC = new TField("nfe", TType.STRUCT, (short)2);
 
-    public List<ColumnOrSuperColumn> success;
+    public ColumnOrSuperColumn success;
     public static final int SUCCESS = 0;
     public InvalidRequestException ire;
     public static final int IRE = 1;
@@ -1527,8 +1443,7 @@
 
     public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
       put(SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, 
-          new ListMetaData(TType.LIST, 
-              new StructMetaData(TType.STRUCT, ColumnOrSuperColumn.class))));
+          new StructMetaData(TType.STRUCT, ColumnOrSuperColumn.class)));
       put(IRE, new FieldMetaData("ire", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRUCT)));
       put(NFE, new FieldMetaData("nfe", TFieldRequirementType.DEFAULT, 
@@ -1536,14 +1451,14 @@
     }});
 
     static {
-      FieldMetaData.addStructMetaDataMap(get_slice_result.class, metaDataMap);
+      FieldMetaData.addStructMetaDataMap(get_result.class, metaDataMap);
     }
 
-    public get_slice_result() {
+    public get_result() {
     }
 
-    public get_slice_result(
-      List<ColumnOrSuperColumn> success,
+    public get_result(
+      ColumnOrSuperColumn success,
       InvalidRequestException ire,
       NotFoundException nfe)
     {
@@ -1556,13 +1471,9 @@
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public get_slice_result(get_slice_result other) {
+    public get_result(get_result other) {
       if (other.isSetSuccess()) {
-        List<ColumnOrSuperColumn> __this__success = new ArrayList<ColumnOrSuperColumn>();
-        for (ColumnOrSuperColumn other_element : other.success) {
-          __this__success.add(new ColumnOrSuperColumn(other_element));
-        }
-        this.success = __this__success;
+        this.success = new ColumnOrSuperColumn(other.success);
       }
       if (other.isSetIre()) {
         this.ire = new InvalidRequestException(other.ire);
@@ -1573,15 +1484,15 @@
     }
 
     @Override
-    public get_slice_result clone() {
-      return new get_slice_result(this);
+    public get_result clone() {
+      return new get_result(this);
     }
 
-    public List<ColumnOrSuperColumn> getSuccess() {
+    public ColumnOrSuperColumn getSuccess() {
       return this.success;
     }
 
-    public get_slice_result setSuccess(List<ColumnOrSuperColumn> success) {
+    public get_result setSuccess(ColumnOrSuperColumn success) {
       this.success = success;
       return this;
     }
@@ -1605,7 +1516,7 @@
       return this.ire;
     }
 
-    public get_slice_result setIre(InvalidRequestException ire) {
+    public get_result setIre(InvalidRequestException ire) {
       this.ire = ire;
       return this;
     }
@@ -1629,7 +1540,7 @@
       return this.nfe;
     }
 
-    public get_slice_result setNfe(NotFoundException nfe) {
+    public get_result setNfe(NotFoundException nfe) {
       this.nfe = nfe;
       return this;
     }
@@ -1655,7 +1566,7 @@
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((List<ColumnOrSuperColumn>)value);
+          setSuccess((ColumnOrSuperColumn)value);
         }
         break;
 
@@ -1714,12 +1625,12 @@
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof get_slice_result)
-        return this.equals((get_slice_result)that);
+      if (that instanceof get_result)
+        return this.equals((get_result)that);
       return false;
     }
 
-    public boolean equals(get_slice_result that) {
+    public boolean equals(get_result that) {
       if (that == null)
         return false;
 
@@ -1758,13 +1669,13 @@
       return 0;
     }
 
-    public int compareTo(get_slice_result other) {
+    public int compareTo(get_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      get_slice_result typedOther = (get_slice_result)other;
+      get_result typedOther = (get_result)other;
 
       lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(isSetSuccess());
       if (lastComparison != 0) {
@@ -1805,19 +1716,9 @@
         switch (field.id)
         {
           case SUCCESS:
-            if (field.type == TType.LIST) {
-              {
-                TList _list17 = iprot.readListBegin();
-                this.success = new ArrayList<ColumnOrSuperColumn>(_list17.size);
-                for (int _i18 = 0; _i18 < _list17.size; ++_i18)
-                {
-                  ColumnOrSuperColumn _elem19;
-                  _elem19 = new ColumnOrSuperColumn();
-                  _elem19.read(iprot);
-                  this.success.add(_elem19);
-                }
-                iprot.readListEnd();
-              }
+            if (field.type == TType.STRUCT) {
+              this.success = new ColumnOrSuperColumn();
+              this.success.read(iprot);
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
@@ -1856,13 +1757,7 @@
 
       if (this.isSetSuccess()) {
         oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-        {
-          oprot.writeListBegin(new TList(TType.STRUCT, this.success.size()));
-          for (ColumnOrSuperColumn _iter20 : this.success)          {
-            _iter20.write(oprot);
-          }
-          oprot.writeListEnd();
-        }
+        this.success.write(oprot);
         oprot.writeFieldEnd();
       } else if (this.isSetIre()) {
         oprot.writeFieldBegin(IRE_FIELD_DESC);
@@ -1879,7 +1774,7 @@
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("get_slice_result(");
+      StringBuilder sb = new StringBuilder("get_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -1916,18 +1811,18 @@
 
   }
 
-  public static class multiget_slice_args implements TBase, java.io.Serializable, Cloneable, Comparable<multiget_slice_args>   {
-    private static final TStruct STRUCT_DESC = new TStruct("multiget_slice_args");
+  public static class get_slice_args implements TBase, java.io.Serializable, Cloneable, Comparable<get_slice_args>   {
+    private static final TStruct STRUCT_DESC = new TStruct("get_slice_args");
     private static final TField KEYSPACE_FIELD_DESC = new TField("keyspace", TType.STRING, (short)1);
-    private static final TField KEYS_FIELD_DESC = new TField("keys", TType.LIST, (short)2);
+    private static final TField KEY_FIELD_DESC = new TField("key", TType.STRING, (short)2);
     private static final TField COLUMN_PARENT_FIELD_DESC = new TField("column_parent", TType.STRUCT, (short)3);
     private static final TField PREDICATE_FIELD_DESC = new TField("predicate", TType.STRUCT, (short)4);
     private static final TField CONSISTENCY_LEVEL_FIELD_DESC = new TField("consistency_level", TType.I32, (short)5);
 
     public String keyspace;
     public static final int KEYSPACE = 1;
-    public List<String> keys;
-    public static final int KEYS = 2;
+    public String key;
+    public static final int KEY = 2;
     public ColumnParent column_parent;
     public static final int COLUMN_PARENT = 3;
     public SlicePredicate predicate;
@@ -1946,9 +1841,8 @@
     public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
       put(KEYSPACE, new FieldMetaData("keyspace", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
-      put(KEYS, new FieldMetaData("keys", TFieldRequirementType.DEFAULT, 
-          new ListMetaData(TType.LIST, 
-              new FieldValueMetaData(TType.STRING))));
+      put(KEY, new FieldMetaData("key", TFieldRequirementType.DEFAULT, 
+          new FieldValueMetaData(TType.STRING)));
       put(COLUMN_PARENT, new FieldMetaData("column_parent", TFieldRequirementType.DEFAULT, 
           new StructMetaData(TType.STRUCT, ColumnParent.class)));
       put(PREDICATE, new FieldMetaData("predicate", TFieldRequirementType.DEFAULT, 
@@ -1958,24 +1852,24 @@
     }});
 
     static {
-      FieldMetaData.addStructMetaDataMap(multiget_slice_args.class, metaDataMap);
+      FieldMetaData.addStructMetaDataMap(get_slice_args.class, metaDataMap);
     }
 
-    public multiget_slice_args() {
+    public get_slice_args() {
       this.consistency_level = 1;
 
     }
 
-    public multiget_slice_args(
+    public get_slice_args(
       String keyspace,
-      List<String> keys,
+      String key,
       ColumnParent column_parent,
       SlicePredicate predicate,
       int consistency_level)
     {
       this();
       this.keyspace = keyspace;
-      this.keys = keys;
+      this.key = key;
       this.column_parent = column_parent;
       this.predicate = predicate;
       this.consistency_level = consistency_level;
@@ -1985,18 +1879,14 @@
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public multiget_slice_args(multiget_slice_args other) {
+    public get_slice_args(get_slice_args other) {
       __isset_bit_vector.clear();
       __isset_bit_vector.or(other.__isset_bit_vector);
       if (other.isSetKeyspace()) {
         this.keyspace = other.keyspace;
       }
-      if (other.isSetKeys()) {
-        List<String> __this__keys = new ArrayList<String>();
-        for (String other_element : other.keys) {
-          __this__keys.add(other_element);
-        }
-        this.keys = __this__keys;
+      if (other.isSetKey()) {
+        this.key = other.key;
       }
       if (other.isSetColumn_parent()) {
         this.column_parent = new ColumnParent(other.column_parent);
@@ -2008,15 +1898,15 @@
     }
 
     @Override
-    public multiget_slice_args clone() {
-      return new multiget_slice_args(this);
+    public get_slice_args clone() {
+      return new get_slice_args(this);
     }
 
     public String getKeyspace() {
       return this.keyspace;
     }
 
-    public multiget_slice_args setKeyspace(String keyspace) {
+    public get_slice_args setKeyspace(String keyspace) {
       this.keyspace = keyspace;
       return this;
     }
@@ -2036,27 +1926,27 @@
       }
     }
 
-    public List<String> getKeys() {
-      return this.keys;
+    public String getKey() {
+      return this.key;
     }
 
-    public multiget_slice_args setKeys(List<String> keys) {
-      this.keys = keys;
+    public get_slice_args setKey(String key) {
+      this.key = key;
       return this;
     }
 
-    public void unsetKeys() {
-      this.keys = null;
+    public void unsetKey() {
+      this.key = null;
     }
 
-    // Returns true if field keys is set (has been asigned a value) and false otherwise
-    public boolean isSetKeys() {
-      return this.keys != 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 setKeysIsSet(boolean value) {
+    public void setKeyIsSet(boolean value) {
       if (!value) {
-        this.keys = null;
+        this.key = null;
       }
     }
 
@@ -2064,7 +1954,7 @@
       return this.column_parent;
     }
 
-    public multiget_slice_args setColumn_parent(ColumnParent column_parent) {
+    public get_slice_args setColumn_parent(ColumnParent column_parent) {
       this.column_parent = column_parent;
       return this;
     }
@@ -2088,7 +1978,7 @@
       return this.predicate;
     }
 
-    public multiget_slice_args setPredicate(SlicePredicate predicate) {
+    public get_slice_args setPredicate(SlicePredicate predicate) {
       this.predicate = predicate;
       return this;
     }
@@ -2120,7 +2010,7 @@
      * 
      * @see ConsistencyLevel
      */
-    public multiget_slice_args setConsistency_level(int consistency_level) {
+    public get_slice_args setConsistency_level(int consistency_level) {
       this.consistency_level = consistency_level;
       setConsistency_levelIsSet(true);
       return this;
@@ -2149,11 +2039,11 @@
         }
         break;
 
-      case KEYS:
+      case KEY:
         if (value == null) {
-          unsetKeys();
+          unsetKey();
         } else {
-          setKeys((List<String>)value);
+          setKey((String)value);
         }
         break;
 
@@ -2191,8 +2081,8 @@
       case KEYSPACE:
         return getKeyspace();
 
-      case KEYS:
-        return getKeys();
+      case KEY:
+        return getKey();
 
       case COLUMN_PARENT:
         return getColumn_parent();
@@ -2213,8 +2103,8 @@
       switch (fieldID) {
       case KEYSPACE:
         return isSetKeyspace();
-      case KEYS:
-        return isSetKeys();
+      case KEY:
+        return isSetKey();
       case COLUMN_PARENT:
         return isSetColumn_parent();
       case PREDICATE:
@@ -2230,12 +2120,12 @@
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof multiget_slice_args)
-        return this.equals((multiget_slice_args)that);
+      if (that instanceof get_slice_args)
+        return this.equals((get_slice_args)that);
       return false;
     }
 
-    public boolean equals(multiget_slice_args that) {
+    public boolean equals(get_slice_args that) {
       if (that == null)
         return false;
 
@@ -2248,12 +2138,12 @@
           return false;
       }
 
-      boolean this_present_keys = true && this.isSetKeys();
-      boolean that_present_keys = true && that.isSetKeys();
-      if (this_present_keys || that_present_keys) {
-        if (!(this_present_keys && that_present_keys))
+      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.keys.equals(that.keys))
+        if (!this.key.equals(that.key))
           return false;
       }
 
@@ -2292,13 +2182,13 @@
       return 0;
     }
 
-    public int compareTo(multiget_slice_args other) {
+    public int compareTo(get_slice_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      multiget_slice_args typedOther = (multiget_slice_args)other;
+      get_slice_args typedOther = (get_slice_args)other;
 
       lastComparison = Boolean.valueOf(isSetKeyspace()).compareTo(isSetKeyspace());
       if (lastComparison != 0) {
@@ -2308,11 +2198,11 @@
       if (lastComparison != 0) {
         return lastComparison;
       }
-      lastComparison = Boolean.valueOf(isSetKeys()).compareTo(isSetKeys());
+      lastComparison = Boolean.valueOf(isSetKey()).compareTo(isSetKey());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      lastComparison = TBaseHelper.compareTo(keys, typedOther.keys);
+      lastComparison = TBaseHelper.compareTo(key, typedOther.key);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2361,19 +2251,9 @@
               TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case KEYS:
-            if (field.type == TType.LIST) {
-              {
-                TList _list21 = iprot.readListBegin();
-                this.keys = new ArrayList<String>(_list21.size);
-                for (int _i22 = 0; _i22 < _list21.size; ++_i22)
-                {
-                  String _elem23;
-                  _elem23 = iprot.readString();
-                  this.keys.add(_elem23);
-                }
-                iprot.readListEnd();
-              }
+          case KEY:
+            if (field.type == TType.STRING) {
+              this.key = iprot.readString();
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
@@ -2424,15 +2304,9 @@
         oprot.writeString(this.keyspace);
         oprot.writeFieldEnd();
       }
-      if (this.keys != null) {
-        oprot.writeFieldBegin(KEYS_FIELD_DESC);
-        {
-          oprot.writeListBegin(new TList(TType.STRING, this.keys.size()));
-          for (String _iter24 : this.keys)          {
-            oprot.writeString(_iter24);
-          }
-          oprot.writeListEnd();
-        }
+      if (this.key != null) {
+        oprot.writeFieldBegin(KEY_FIELD_DESC);
+        oprot.writeString(this.key);
         oprot.writeFieldEnd();
       }
       if (this.column_parent != null) {
@@ -2454,7 +2328,7 @@
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("multiget_slice_args(");
+      StringBuilder sb = new StringBuilder("get_slice_args(");
       boolean first = true;
 
       sb.append("keyspace:");
@@ -2465,11 +2339,11 @@
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("keys:");
-      if (this.keys == null) {
+      sb.append("key:");
+      if (this.key == null) {
         sb.append("null");
       } else {
-        sb.append(this.keys);
+        sb.append(this.key);
       }
       first = false;
       if (!first) sb.append(", ");
@@ -2514,81 +2388,78 @@
 
   }
 
-  public static class multiget_slice_result implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("multiget_slice_result");
-    private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.MAP, (short)0);
+  public static class get_slice_result implements TBase, java.io.Serializable, Cloneable, Comparable<get_slice_result>   {
+    private static final TStruct STRUCT_DESC = new TStruct("get_slice_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 NFE_FIELD_DESC = new TField("nfe", TType.STRUCT, (short)2);
 
-    public Map<String,List<ColumnOrSuperColumn>> success;
+    public List<ColumnOrSuperColumn> success;
     public static final int SUCCESS = 0;
     public InvalidRequestException ire;
     public static final int IRE = 1;
+    public NotFoundException nfe;
+    public static final int NFE = 2;
 
     // isset id assignments
 
     public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
       put(SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, 
-          new MapMetaData(TType.MAP, 
-              new FieldValueMetaData(TType.STRING), 
-              new ListMetaData(TType.LIST, 
-                  new StructMetaData(TType.STRUCT, ColumnOrSuperColumn.class)))));
+          new ListMetaData(TType.LIST, 
+              new StructMetaData(TType.STRUCT, ColumnOrSuperColumn.class))));
       put(IRE, new FieldMetaData("ire", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRUCT)));
+      put(NFE, new FieldMetaData("nfe", TFieldRequirementType.DEFAULT, 
+          new FieldValueMetaData(TType.STRUCT)));
     }});
 
     static {
-      FieldMetaData.addStructMetaDataMap(multiget_slice_result.class, metaDataMap);
+      FieldMetaData.addStructMetaDataMap(get_slice_result.class, metaDataMap);
     }
 
-    public multiget_slice_result() {
+    public get_slice_result() {
     }
 
-    public multiget_slice_result(
-      Map<String,List<ColumnOrSuperColumn>> success,
-      InvalidRequestException ire)
+    public get_slice_result(
+      List<ColumnOrSuperColumn> success,
+      InvalidRequestException ire,
+      NotFoundException nfe)
     {
       this();
       this.success = success;
       this.ire = ire;
+      this.nfe = nfe;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public multiget_slice_result(multiget_slice_result other) {
+    public get_slice_result(get_slice_result other) {
       if (other.isSetSuccess()) {
-        Map<String,List<ColumnOrSuperColumn>> __this__success = new HashMap<String,List<ColumnOrSuperColumn>>();
-        for (Map.Entry<String, List<ColumnOrSuperColumn>> other_element : other.success.entrySet()) {
-
-          String other_element_key = other_element.getKey();
-          List<ColumnOrSuperColumn> other_element_value = other_element.getValue();
-
-          String __this__success_copy_key = other_element_key;
-
-          List<ColumnOrSuperColumn> __this__success_copy_value = new ArrayList<ColumnOrSuperColumn>();
-          for (ColumnOrSuperColumn other_element_value_element : other_element_value) {
-            __this__success_copy_value.add(new ColumnOrSuperColumn(other_element_value_element));
-          }
-
-          __this__success.put(__this__success_copy_key, __this__success_copy_value);
+        List<ColumnOrSuperColumn> __this__success = new ArrayList<ColumnOrSuperColumn>();
+        for (ColumnOrSuperColumn other_element : other.success) {
+          __this__success.add(new ColumnOrSuperColumn(other_element));
         }
         this.success = __this__success;
       }
       if (other.isSetIre()) {
         this.ire = new InvalidRequestException(other.ire);
       }
+      if (other.isSetNfe()) {
+        this.nfe = new NotFoundException(other.nfe);
+      }
     }
 
     @Override
-    public multiget_slice_result clone() {
-      return new multiget_slice_result(this);
+    public get_slice_result clone() {
+      return new get_slice_result(this);
     }
 
-    public Map<String,List<ColumnOrSuperColumn>> getSuccess() {
+    public List<ColumnOrSuperColumn> getSuccess() {
       return this.success;
     }
 
-    public multiget_slice_result setSuccess(Map<String,List<ColumnOrSuperColumn>> success) {
+    public get_slice_result setSuccess(List<ColumnOrSuperColumn> success) {
       this.success = success;
       return this;
     }
@@ -2612,7 +2483,7 @@
       return this.ire;
     }
 
-    public multiget_slice_result setIre(InvalidRequestException ire) {
+    public get_slice_result setIre(InvalidRequestException ire) {
       this.ire = ire;
       return this;
     }
@@ -2632,13 +2503,37 @@
       }
     }
 
+    public NotFoundException getNfe() {
+      return this.nfe;
+    }
+
+    public get_slice_result setNfe(NotFoundException nfe) {
+      this.nfe = nfe;
+      return this;
+    }
+
+    public void unsetNfe() {
+      this.nfe = null;
+    }
+
+    // Returns true if field nfe is set (has been asigned a value) and false otherwise
+    public boolean isSetNfe() {
+      return this.nfe != null;
+    }
+
+    public void setNfeIsSet(boolean value) {
+      if (!value) {
+        this.nfe = null;
+      }
+    }
+
     public void setFieldValue(int fieldID, Object value) {
       switch (fieldID) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((Map<String,List<ColumnOrSuperColumn>>)value);
+          setSuccess((List<ColumnOrSuperColumn>)value);
         }
         break;
 
@@ -2650,6 +2545,14 @@
         }
         break;
 
+      case NFE:
+        if (value == null) {
+          unsetNfe();
+        } else {
+          setNfe((NotFoundException)value);
+        }
+        break;
+
       default:
         throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
@@ -2663,6 +2566,9 @@
       case IRE:
         return getIre();
 
+      case NFE:
+        return getNfe();
+
       default:
         throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
@@ -2675,6 +2581,8 @@
         return isSetSuccess();
       case IRE:
         return isSetIre();
+      case NFE:
+        return isSetNfe();
       default:
         throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
@@ -2684,12 +2592,12 @@
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof multiget_slice_result)
-        return this.equals((multiget_slice_result)that);
+      if (that instanceof get_slice_result)
+        return this.equals((get_slice_result)that);
       return false;
     }
 
-    public boolean equals(multiget_slice_result that) {
+    public boolean equals(get_slice_result that) {
       if (that == null)
         return false;
 
@@ -2711,6 +2619,15 @@
           return false;
       }
 
+      boolean this_present_nfe = true && this.isSetNfe();
+      boolean that_present_nfe = true && that.isSetNfe();
+      if (this_present_nfe || that_present_nfe) {
+        if (!(this_present_nfe && that_present_nfe))
+          return false;
+        if (!this.nfe.equals(that.nfe))
+          return false;
+      }
+
       return true;
     }
 
@@ -2719,6 +2636,41 @@
       return 0;
     }
 
+    public int compareTo(get_slice_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      get_slice_result typedOther = (get_slice_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      lastComparison = TBaseHelper.compareTo(success, typedOther.success);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      lastComparison = Boolean.valueOf(isSetIre()).compareTo(isSetIre());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      lastComparison = TBaseHelper.compareTo(ire, typedOther.ire);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      lastComparison = Boolean.valueOf(isSetNfe()).compareTo(isSetNfe());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      lastComparison = TBaseHelper.compareTo(nfe, typedOther.nfe);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      return 0;
+    }
+
     public void read(TProtocol iprot) throws TException {
       TField field;
       iprot.readStructBegin();
@@ -2731,30 +2683,18 @@
         switch (field.id)
         {
           case SUCCESS:
-            if (field.type == TType.MAP) {
+            if (field.type == TType.LIST) {
               {
-                TMap _map25 = iprot.readMapBegin();
-                this.success = new HashMap<String,List<ColumnOrSuperColumn>>(2*_map25.size);
-                for (int _i26 = 0; _i26 < _map25.size; ++_i26)
+                TList _list8 = iprot.readListBegin();
+                this.success = new ArrayList<ColumnOrSuperColumn>(_list8.size);
+                for (int _i9 = 0; _i9 < _list8.size; ++_i9)
                 {
-                  String _key27;
-                  List<ColumnOrSuperColumn> _val28;
-                  _key27 = iprot.readString();
-                  {
-                    TList _list29 = iprot.readListBegin();
-                    _val28 = new ArrayList<ColumnOrSuperColumn>(_list29.size);
-                    for (int _i30 = 0; _i30 < _list29.size; ++_i30)
-                    {
-                      ColumnOrSuperColumn _elem31;
-                      _elem31 = new ColumnOrSuperColumn();
-                      _elem31.read(iprot);
-                      _val28.add(_elem31);
-                    }
-                    iprot.readListEnd();
-                  }
-                  this.success.put(_key27, _val28);
+                  ColumnOrSuperColumn _elem10;
+                  _elem10 = new ColumnOrSuperColumn();
+                  _elem10.read(iprot);
+                  this.success.add(_elem10);
                 }
-                iprot.readMapEnd();
+                iprot.readListEnd();
               }
             } else { 
               TProtocolUtil.skip(iprot, field.type);
@@ -2768,6 +2708,14 @@
               TProtocolUtil.skip(iprot, field.type);
             }
             break;
+          case NFE:
+            if (field.type == TType.STRUCT) {
+              this.nfe = new NotFoundException();
+              this.nfe.read(iprot);
+            } else { 
+              TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           default:
             TProtocolUtil.skip(iprot, field.type);
             break;
@@ -2787,24 +2735,21 @@
       if (this.isSetSuccess()) {
         oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
         {
-          oprot.writeMapBegin(new TMap(TType.STRING, TType.LIST, this.success.size()));
-          for (Map.Entry<String, List<ColumnOrSuperColumn>> _iter32 : this.success.entrySet())          {
-            oprot.writeString(_iter32.getKey());
-            {
-              oprot.writeListBegin(new TList(TType.STRUCT, _iter32.getValue().size()));
-              for (ColumnOrSuperColumn _iter33 : _iter32.getValue())              {
-                _iter33.write(oprot);
-              }
-              oprot.writeListEnd();
-            }
+          oprot.writeListBegin(new TList(TType.STRUCT, this.success.size()));
+          for (ColumnOrSuperColumn _iter11 : this.success)          {
+            _iter11.write(oprot);
           }
-          oprot.writeMapEnd();
+          oprot.writeListEnd();
         }
         oprot.writeFieldEnd();
       } else if (this.isSetIre()) {
         oprot.writeFieldBegin(IRE_FIELD_DESC);
         this.ire.write(oprot);
         oprot.writeFieldEnd();
+      } else if (this.isSetNfe()) {
+        oprot.writeFieldBegin(NFE_FIELD_DESC);
+        this.nfe.write(oprot);
+        oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
@@ -2812,7 +2757,7 @@
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("multiget_slice_result(");
+      StringBuilder sb = new StringBuilder("get_slice_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -2830,6 +2775,14 @@
         sb.append(this.ire);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("nfe:");
+      if (this.nfe == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.nfe);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -2841,17 +2794,17 @@
 
   }
 
-  public static class get_args implements TBase, java.io.Serializable, Cloneable, Comparable<get_args>   {
-    private static final TStruct STRUCT_DESC = new TStruct("get_args");
+  public static class multiget_args implements TBase, java.io.Serializable, Cloneable, Comparable<multiget_args>   {
+    private static final TStruct STRUCT_DESC = new TStruct("multiget_args");
     private static final TField KEYSPACE_FIELD_DESC = new TField("keyspace", TType.STRING, (short)1);
-    private static final TField KEY_FIELD_DESC = new TField("key", TType.STRING, (short)2);
+    private static final TField KEYS_FIELD_DESC = new TField("keys", TType.LIST, (short)2);
     private static final TField COLUMN_PATH_FIELD_DESC = new TField("column_path", TType.STRUCT, (short)3);
     private static final TField CONSISTENCY_LEVEL_FIELD_DESC = new TField("consistency_level", TType.I32, (short)4);
 
     public String keyspace;
     public static final int KEYSPACE = 1;
-    public String key;
-    public static final int KEY = 2;
+    public List<String> keys;
+    public static final int KEYS = 2;
     public ColumnPath column_path;
     public static final int COLUMN_PATH = 3;
     /**
@@ -2868,8 +2821,9 @@
     public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
       put(KEYSPACE, new FieldMetaData("keyspace", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
-      put(KEY, new FieldMetaData("key", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRING)));
+      put(KEYS, new FieldMetaData("keys", TFieldRequirementType.DEFAULT, 
+          new ListMetaData(TType.LIST, 
+              new FieldValueMetaData(TType.STRING))));
       put(COLUMN_PATH, new FieldMetaData("column_path", TFieldRequirementType.DEFAULT, 
           new StructMetaData(TType.STRUCT, ColumnPath.class)));
       put(CONSISTENCY_LEVEL, new FieldMetaData("consistency_level", TFieldRequirementType.DEFAULT, 
@@ -2877,23 +2831,23 @@
     }});
 
     static {
-      FieldMetaData.addStructMetaDataMap(get_args.class, metaDataMap);
+      FieldMetaData.addStructMetaDataMap(multiget_args.class, metaDataMap);
     }
 
-    public get_args() {
+    public multiget_args() {
       this.consistency_level = 1;
 
     }
 
-    public get_args(
+    public multiget_args(
       String keyspace,
-      String key,
+      List<String> keys,
       ColumnPath column_path,
       int consistency_level)
     {
       this();
       this.keyspace = keyspace;
-      this.key = key;
+      this.keys = keys;
       this.column_path = column_path;
       this.consistency_level = consistency_level;
       setConsistency_levelIsSet(true);
@@ -2902,14 +2856,18 @@
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public get_args(get_args other) {
+    public multiget_args(multiget_args other) {
       __isset_bit_vector.clear();
       __isset_bit_vector.or(other.__isset_bit_vector);
       if (other.isSetKeyspace()) {
         this.keyspace = other.keyspace;
       }
-      if (other.isSetKey()) {
-        this.key = other.key;
+      if (other.isSetKeys()) {
+        List<String> __this__keys = new ArrayList<String>();
+        for (String other_element : other.keys) {
+          __this__keys.add(other_element);
+        }
+        this.keys = __this__keys;
       }
       if (other.isSetColumn_path()) {
         this.column_path = new ColumnPath(other.column_path);
@@ -2918,15 +2876,15 @@
     }
 
     @Override
-    public get_args clone() {
-      return new get_args(this);
+    public multiget_args clone() {
+      return new multiget_args(this);
     }
 
     public String getKeyspace() {
       return this.keyspace;
     }
 
-    public get_args setKeyspace(String keyspace) {
+    public multiget_args setKeyspace(String keyspace) {
       this.keyspace = keyspace;
       return this;
     }
@@ -2946,27 +2904,27 @@
       }
     }
 
-    public String getKey() {
-      return this.key;
+    public List<String> getKeys() {
+      return this.keys;
     }
 
-    public get_args setKey(String key) {
-      this.key = key;
+    public multiget_args setKeys(List<String> keys) {
+      this.keys = keys;
       return this;
     }
 
-    public void unsetKey() {
-      this.key = null;
+    public void unsetKeys() {
+      this.keys = null;
     }
 
-    // Returns true if field key is set (has been asigned a value) and false otherwise
-    public boolean isSetKey() {
-      return this.key != null;
+    // Returns true if field keys is set (has been asigned a value) and false otherwise
+    public boolean isSetKeys() {
+      return this.keys != null;
     }
 
-    public void setKeyIsSet(boolean value) {
+    public void setKeysIsSet(boolean value) {
       if (!value) {
-        this.key = null;
+        this.keys = null;
       }
     }
 
@@ -2974,7 +2932,7 @@
       return this.column_path;
     }
 
-    public get_args setColumn_path(ColumnPath column_path) {
+    public multiget_args setColumn_path(ColumnPath column_path) {
       this.column_path = column_path;
       return this;
     }
@@ -3006,7 +2964,7 @@
      * 
      * @see ConsistencyLevel
      */
-    public get_args setConsistency_level(int consistency_level) {
+    public multiget_args setConsistency_level(int consistency_level) {
       this.consistency_level = consistency_level;
       setConsistency_levelIsSet(true);
       return this;
@@ -3035,11 +2993,11 @@
         }
         break;
 
-      case KEY:
+      case KEYS:
         if (value == null) {
-          unsetKey();
+          unsetKeys();
         } else {
-          setKey((String)value);
+          setKeys((List<String>)value);
         }
         break;
 
@@ -3069,8 +3027,8 @@
       case KEYSPACE:
         return getKeyspace();
 
-      case KEY:
-        return getKey();
+      case KEYS:
+        return getKeys();
 
       case COLUMN_PATH:
         return getColumn_path();
@@ -3088,8 +3046,8 @@
       switch (fieldID) {
       case KEYSPACE:
         return isSetKeyspace();
-      case KEY:
-        return isSetKey();
+      case KEYS:
+        return isSetKeys();
       case COLUMN_PATH:
         return isSetColumn_path();
       case CONSISTENCY_LEVEL:
@@ -3103,12 +3061,12 @@
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof get_args)
-        return this.equals((get_args)that);
+      if (that instanceof multiget_args)
+        return this.equals((multiget_args)that);
       return false;
     }
 
-    public boolean equals(get_args that) {
+    public boolean equals(multiget_args that) {
       if (that == null)
         return false;
 
@@ -3121,12 +3079,12 @@
           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))
+      boolean this_present_keys = true && this.isSetKeys();
+      boolean that_present_keys = true && that.isSetKeys();
+      if (this_present_keys || that_present_keys) {
+        if (!(this_present_keys && that_present_keys))
           return false;
-        if (!this.key.equals(that.key))
+        if (!this.keys.equals(that.keys))
           return false;
       }
 
@@ -3156,13 +3114,13 @@
       return 0;
     }
 
-    public int compareTo(get_args other) {
+    public int compareTo(multiget_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      get_args typedOther = (get_args)other;
+      multiget_args typedOther = (multiget_args)other;
 
       lastComparison = Boolean.valueOf(isSetKeyspace()).compareTo(isSetKeyspace());
       if (lastComparison != 0) {
@@ -3172,11 +3130,11 @@
       if (lastComparison != 0) {
         return lastComparison;
       }
-      lastComparison = Boolean.valueOf(isSetKey()).compareTo(isSetKey());
+      lastComparison = Boolean.valueOf(isSetKeys()).compareTo(isSetKeys());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      lastComparison = TBaseHelper.compareTo(key, typedOther.key);
+      lastComparison = TBaseHelper.compareTo(keys, typedOther.keys);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -3217,9 +3175,19 @@
               TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case KEY:
-            if (field.type == TType.STRING) {
-              this.key = iprot.readString();
+          case KEYS:
+            if (field.type == TType.LIST) {
+              {
+                TList _list12 = iprot.readListBegin();
+                this.keys = new ArrayList<String>(_list12.size);
+                for (int _i13 = 0; _i13 < _list12.size; ++_i13)
+                {
+                  String _elem14;
+                  _elem14 = iprot.readString();
+                  this.keys.add(_elem14);
+                }
+                iprot.readListEnd();
+              }
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
@@ -3262,9 +3230,15 @@
         oprot.writeString(this.keyspace);
         oprot.writeFieldEnd();
       }
-      if (this.key != null) {
-        oprot.writeFieldBegin(KEY_FIELD_DESC);
-        oprot.writeString(this.key);
+      if (this.keys != null) {
+        oprot.writeFieldBegin(KEYS_FIELD_DESC);
+        {
+          oprot.writeListBegin(new TList(TType.STRING, this.keys.size()));
+          for (String _iter15 : this.keys)          {
+            oprot.writeString(_iter15);
+          }
+          oprot.writeListEnd();
+        }
         oprot.writeFieldEnd();
       }
       if (this.column_path != null) {
@@ -3281,7 +3255,7 @@
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("get_args(");
+      StringBuilder sb = new StringBuilder("multiget_args(");
       boolean first = true;
 
       sb.append("keyspace:");
@@ -3292,11 +3266,11 @@
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("key:");
-      if (this.key == null) {
+      sb.append("keys:");
+      if (this.keys == null) {
         sb.append("null");
       } else {
-        sb.append(this.key);
+        sb.append(this.keys);
       }
       first = false;
       if (!first) sb.append(", ");
@@ -3333,73 +3307,77 @@
 
   }
 
-  public static class get_result implements TBase, java.io.Serializable, Cloneable, Comparable<get_result>   {
-    private static final TStruct STRUCT_DESC = new TStruct("get_result");
-    private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.STRUCT, (short)0);
+  public static class multiget_result implements TBase, java.io.Serializable, Cloneable   {
+    private static final TStruct STRUCT_DESC = new TStruct("multiget_result");
+    private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.MAP, (short)0);
     private static final TField IRE_FIELD_DESC = new TField("ire", TType.STRUCT, (short)1);
-    private static final TField NFE_FIELD_DESC = new TField("nfe", TType.STRUCT, (short)2);
 
-    public ColumnOrSuperColumn success;
+    public Map<String,ColumnOrSuperColumn> success;
     public static final int SUCCESS = 0;
     public InvalidRequestException ire;
     public static final int IRE = 1;
-    public NotFoundException nfe;
-    public static final int NFE = 2;
 
     // isset id assignments
 
     public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
       put(SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, 
-          new StructMetaData(TType.STRUCT, ColumnOrSuperColumn.class)));
+          new MapMetaData(TType.MAP, 
+              new FieldValueMetaData(TType.STRING), 
+              new StructMetaData(TType.STRUCT, ColumnOrSuperColumn.class))));
       put(IRE, new FieldMetaData("ire", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRUCT)));
-      put(NFE, new FieldMetaData("nfe", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRUCT)));
     }});
 
     static {
-      FieldMetaData.addStructMetaDataMap(get_result.class, metaDataMap);
+      FieldMetaData.addStructMetaDataMap(multiget_result.class, metaDataMap);
     }
 
-    public get_result() {
+    public multiget_result() {
     }
 
-    public get_result(
-      ColumnOrSuperColumn success,
-      InvalidRequestException ire,
-      NotFoundException nfe)
+    public multiget_result(
+      Map<String,ColumnOrSuperColumn> success,
+      InvalidRequestException ire)
     {
       this();
       this.success = success;
       this.ire = ire;
-      this.nfe = nfe;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public get_result(get_result other) {
+    public multiget_result(multiget_result other) {
       if (other.isSetSuccess()) {
-        this.success = new ColumnOrSuperColumn(other.success);
+        Map<String,ColumnOrSuperColumn> __this__success = new HashMap<String,ColumnOrSuperColumn>();
+        for (Map.Entry<String, ColumnOrSuperColumn> other_element : other.success.entrySet()) {
+
+          String other_element_key = other_element.getKey();
+          ColumnOrSuperColumn other_element_value = other_element.getValue();
+
+          String __this__success_copy_key = other_element_key;
+
+          ColumnOrSuperColumn __this__success_copy_value = new ColumnOrSuperColumn(other_element_value);
+
+          __this__success.put(__this__success_copy_key, __this__success_copy_value);
+        }
+        this.success = __this__success;
       }
       if (other.isSetIre()) {
         this.ire = new InvalidRequestException(other.ire);
       }
-      if (other.isSetNfe()) {
-        this.nfe = new NotFoundException(other.nfe);
-      }
     }
 
     @Override
-    public get_result clone() {
-      return new get_result(this);
+    public multiget_result clone() {
+      return new multiget_result(this);
     }
 
-    public ColumnOrSuperColumn getSuccess() {
+    public Map<String,ColumnOrSuperColumn> getSuccess() {
       return this.success;
     }
 
-    public get_result setSuccess(ColumnOrSuperColumn success) {
+    public multiget_result setSuccess(Map<String,ColumnOrSuperColumn> success) {
       this.success = success;
       return this;
     }
@@ -3423,7 +3401,7 @@
       return this.ire;
     }
 
-    public get_result setIre(InvalidRequestException ire) {
+    public multiget_result setIre(InvalidRequestException ire) {
       this.ire = ire;
       return this;
     }

[... 4210 lines stripped ...]


Mime
View raw message