cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/5] git commit: Thrift generated files for CASSANDRA-3761 (CQL 3.0)
Date Wed, 25 Jan 2012 12:35:05 GMT
Updated Branches:
  refs/heads/trunk 86637d43c -> 087d24a9d


Thrift generated files for CASSANDRA-3761 (CQL 3.0)


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/087d24a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/087d24a9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/087d24a9

Branch: refs/heads/trunk
Commit: 087d24a9d81e1fc53d38db722514f82c48cb9476
Parents: 655ccc3
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Mon Jan 16 19:21:10 2012 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Jan 25 13:34:19 2012 +0100

----------------------------------------------------------------------
 .../org/apache/cassandra/thrift/Cassandra.java     |  999 ++++++++++++---
 .../org/apache/cassandra/thrift/CfDef.java         |  260 ++++-
 .../org/apache/cassandra/thrift/Constants.java     |    2 +-
 .../org/apache/cassandra/thrift/CqlMetadata.java   |   44 +-
 .../org/apache/cassandra/thrift/CqlResult.java     |   18 +-
 .../org/apache/cassandra/thrift/CqlRow.java        |   18 +-
 .../org/apache/cassandra/thrift/KsDef.java         |   40 +-
 7 files changed, 1157 insertions(+), 224 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/087d24a9/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
index 7def434..ca1a8c0 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
@@ -327,6 +327,8 @@ public class Cassandra {
      */
     public CqlResult execute_prepared_cql_query(int itemId, List<ByteBuffer> values) throws InvalidRequestException, UnavailableException, TimedOutException, SchemaDisagreementException, org.apache.thrift.TException;
 
+    public void set_cql_version(String version) throws InvalidRequestException, org.apache.thrift.TException;
+
   }
 
   public interface AsyncIface {
@@ -397,6 +399,8 @@ public class Cassandra {
 
     public void execute_prepared_cql_query(int itemId, List<ByteBuffer> values, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.execute_prepared_cql_query_call> resultHandler) throws org.apache.thrift.TException;
 
+    public void set_cql_version(String version, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.set_cql_version_call> resultHandler) throws org.apache.thrift.TException;
+
   }
 
   public static class Client extends org.apache.thrift.TServiceClient implements Iface {
@@ -1396,6 +1400,29 @@ public class Cassandra {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "execute_prepared_cql_query failed: unknown result");
     }
 
+    public void set_cql_version(String version) throws InvalidRequestException, org.apache.thrift.TException
+    {
+      send_set_cql_version(version);
+      recv_set_cql_version();
+    }
+
+    public void send_set_cql_version(String version) throws org.apache.thrift.TException
+    {
+      set_cql_version_args args = new set_cql_version_args();
+      args.setVersion(version);
+      sendBase("set_cql_version", args);
+    }
+
+    public void recv_set_cql_version() throws InvalidRequestException, org.apache.thrift.TException
+    {
+      set_cql_version_result result = new set_cql_version_result();
+      receiveBase(result, "set_cql_version");
+      if (result.ire != null) {
+        throw result.ire;
+      }
+      return;
+    }
+
   }
   public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface {
     public static class Factory implements org.apache.thrift.async.TAsyncClientFactory<AsyncClient> {
@@ -2566,6 +2593,38 @@ public class Cassandra {
       }
     }
 
+    public void set_cql_version(String version, org.apache.thrift.async.AsyncMethodCallback<set_cql_version_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      set_cql_version_call method_call = new set_cql_version_call(version, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class set_cql_version_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private String version;
+      public set_cql_version_call(String version, org.apache.thrift.async.AsyncMethodCallback<set_cql_version_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.version = version;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("set_cql_version", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        set_cql_version_args args = new set_cql_version_args();
+        args.setVersion(version);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public void getResult() throws InvalidRequestException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        (new Client(prot)).recv_set_cql_version();
+      }
+    }
+
   }
 
   public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor {
@@ -2612,6 +2671,7 @@ public class Cassandra {
       processMap.put("execute_cql_query", new execute_cql_query());
       processMap.put("prepare_cql_query", new prepare_cql_query());
       processMap.put("execute_prepared_cql_query", new execute_prepared_cql_query());
+      processMap.put("set_cql_version", new set_cql_version());
       return processMap;
     }
 
@@ -3342,6 +3402,26 @@ public class Cassandra {
       }
     }
 
+    private static class set_cql_version<I extends Iface> extends org.apache.thrift.ProcessFunction<I, set_cql_version_args> {
+      public set_cql_version() {
+        super("set_cql_version");
+      }
+
+      protected set_cql_version_args getEmptyArgsInstance() {
+        return new set_cql_version_args();
+      }
+
+      protected set_cql_version_result getResult(I iface, set_cql_version_args args) throws org.apache.thrift.TException {
+        set_cql_version_result result = new set_cql_version_result();
+        try {
+          iface.set_cql_version(args.version);
+        } catch (InvalidRequestException ire) {
+          result.ire = ire;
+        }
+        return result;
+      }
+    }
+
   }
 
   public static class login_args implements org.apache.thrift.TBase<login_args, login_args._Fields>, java.io.Serializable, Cloneable   {
@@ -6983,14 +7063,14 @@ public class Cassandra {
           case 0: // SUCCESS
             if (field.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list87 = iprot.readListBegin();
-                this.success = new ArrayList<ColumnOrSuperColumn>(_list87.size);
-                for (int _i88 = 0; _i88 < _list87.size; ++_i88)
+                org.apache.thrift.protocol.TList _list91 = iprot.readListBegin();
+                this.success = new ArrayList<ColumnOrSuperColumn>(_list91.size);
+                for (int _i92 = 0; _i92 < _list91.size; ++_i92)
                 {
-                  ColumnOrSuperColumn _elem89; // required
-                  _elem89 = new ColumnOrSuperColumn();
-                  _elem89.read(iprot);
-                  this.success.add(_elem89);
+                  ColumnOrSuperColumn _elem93; // required
+                  _elem93 = new ColumnOrSuperColumn();
+                  _elem93.read(iprot);
+                  this.success.add(_elem93);
                 }
                 iprot.readListEnd();
               }
@@ -7040,9 +7120,9 @@ public class Cassandra {
         oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size()));
-          for (ColumnOrSuperColumn _iter90 : this.success)
+          for (ColumnOrSuperColumn _iter94 : this.success)
           {
-            _iter90.write(oprot);
+            _iter94.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -8842,13 +8922,13 @@ public class Cassandra {
           case 1: // KEYS
             if (field.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list91 = iprot.readListBegin();
-                this.keys = new ArrayList<ByteBuffer>(_list91.size);
-                for (int _i92 = 0; _i92 < _list91.size; ++_i92)
+                org.apache.thrift.protocol.TList _list95 = iprot.readListBegin();
+                this.keys = new ArrayList<ByteBuffer>(_list95.size);
+                for (int _i96 = 0; _i96 < _list95.size; ++_i96)
                 {
-                  ByteBuffer _elem93; // required
-                  _elem93 = iprot.readBinary();
-                  this.keys.add(_elem93);
+                  ByteBuffer _elem97; // required
+                  _elem97 = iprot.readBinary();
+                  this.keys.add(_elem97);
                 }
                 iprot.readListEnd();
               }
@@ -8898,9 +8978,9 @@ public class Cassandra {
         oprot.writeFieldBegin(KEYS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.keys.size()));
-          for (ByteBuffer _iter94 : this.keys)
+          for (ByteBuffer _iter98 : this.keys)
           {
-            oprot.writeBinary(_iter94);
+            oprot.writeBinary(_iter98);
           }
           oprot.writeListEnd();
         }
@@ -9489,26 +9569,26 @@ public class Cassandra {
           case 0: // SUCCESS
             if (field.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map95 = iprot.readMapBegin();
-                this.success = new HashMap<ByteBuffer,List<ColumnOrSuperColumn>>(2*_map95.size);
-                for (int _i96 = 0; _i96 < _map95.size; ++_i96)
+                org.apache.thrift.protocol.TMap _map99 = iprot.readMapBegin();
+                this.success = new HashMap<ByteBuffer,List<ColumnOrSuperColumn>>(2*_map99.size);
+                for (int _i100 = 0; _i100 < _map99.size; ++_i100)
                 {
-                  ByteBuffer _key97; // required
-                  List<ColumnOrSuperColumn> _val98; // required
-                  _key97 = iprot.readBinary();
+                  ByteBuffer _key101; // required
+                  List<ColumnOrSuperColumn> _val102; // required
+                  _key101 = iprot.readBinary();
                   {
-                    org.apache.thrift.protocol.TList _list99 = iprot.readListBegin();
-                    _val98 = new ArrayList<ColumnOrSuperColumn>(_list99.size);
-                    for (int _i100 = 0; _i100 < _list99.size; ++_i100)
+                    org.apache.thrift.protocol.TList _list103 = iprot.readListBegin();
+                    _val102 = new ArrayList<ColumnOrSuperColumn>(_list103.size);
+                    for (int _i104 = 0; _i104 < _list103.size; ++_i104)
                     {
-                      ColumnOrSuperColumn _elem101; // required
-                      _elem101 = new ColumnOrSuperColumn();
-                      _elem101.read(iprot);
-                      _val98.add(_elem101);
+                      ColumnOrSuperColumn _elem105; // required
+                      _elem105 = new ColumnOrSuperColumn();
+                      _elem105.read(iprot);
+                      _val102.add(_elem105);
                     }
                     iprot.readListEnd();
                   }
-                  this.success.put(_key97, _val98);
+                  this.success.put(_key101, _val102);
                 }
                 iprot.readMapEnd();
               }
@@ -9558,14 +9638,14 @@ public class Cassandra {
         oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, this.success.size()));
-          for (Map.Entry<ByteBuffer, List<ColumnOrSuperColumn>> _iter102 : this.success.entrySet())
+          for (Map.Entry<ByteBuffer, List<ColumnOrSuperColumn>> _iter106 : this.success.entrySet())
           {
-            oprot.writeBinary(_iter102.getKey());
+            oprot.writeBinary(_iter106.getKey());
             {
-              oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter102.getValue().size()));
-              for (ColumnOrSuperColumn _iter103 : _iter102.getValue())
+              oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter106.getValue().size()));
+              for (ColumnOrSuperColumn _iter107 : _iter106.getValue())
               {
-                _iter103.write(oprot);
+                _iter107.write(oprot);
               }
               oprot.writeListEnd();
             }
@@ -10153,13 +10233,13 @@ public class Cassandra {
           case 1: // KEYS
             if (field.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list104 = iprot.readListBegin();
-                this.keys = new ArrayList<ByteBuffer>(_list104.size);
-                for (int _i105 = 0; _i105 < _list104.size; ++_i105)
+                org.apache.thrift.protocol.TList _list108 = iprot.readListBegin();
+                this.keys = new ArrayList<ByteBuffer>(_list108.size);
+                for (int _i109 = 0; _i109 < _list108.size; ++_i109)
                 {
-                  ByteBuffer _elem106; // required
-                  _elem106 = iprot.readBinary();
-                  this.keys.add(_elem106);
+                  ByteBuffer _elem110; // required
+                  _elem110 = iprot.readBinary();
+                  this.keys.add(_elem110);
                 }
                 iprot.readListEnd();
               }
@@ -10209,9 +10289,9 @@ public class Cassandra {
         oprot.writeFieldBegin(KEYS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.keys.size()));
-          for (ByteBuffer _iter107 : this.keys)
+          for (ByteBuffer _iter111 : this.keys)
           {
-            oprot.writeBinary(_iter107);
+            oprot.writeBinary(_iter111);
           }
           oprot.writeListEnd();
         }
@@ -10796,15 +10876,15 @@ public class Cassandra {
           case 0: // SUCCESS
             if (field.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map108 = iprot.readMapBegin();
-                this.success = new HashMap<ByteBuffer,Integer>(2*_map108.size);
-                for (int _i109 = 0; _i109 < _map108.size; ++_i109)
+                org.apache.thrift.protocol.TMap _map112 = iprot.readMapBegin();
+                this.success = new HashMap<ByteBuffer,Integer>(2*_map112.size);
+                for (int _i113 = 0; _i113 < _map112.size; ++_i113)
                 {
-                  ByteBuffer _key110; // required
-                  int _val111; // required
-                  _key110 = iprot.readBinary();
-                  _val111 = iprot.readI32();
-                  this.success.put(_key110, _val111);
+                  ByteBuffer _key114; // required
+                  int _val115; // required
+                  _key114 = iprot.readBinary();
+                  _val115 = iprot.readI32();
+                  this.success.put(_key114, _val115);
                 }
                 iprot.readMapEnd();
               }
@@ -10854,10 +10934,10 @@ public class Cassandra {
         oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, this.success.size()));
-          for (Map.Entry<ByteBuffer, Integer> _iter112 : this.success.entrySet())
+          for (Map.Entry<ByteBuffer, Integer> _iter116 : this.success.entrySet())
           {
-            oprot.writeBinary(_iter112.getKey());
-            oprot.writeI32(_iter112.getValue());
+            oprot.writeBinary(_iter116.getKey());
+            oprot.writeI32(_iter116.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -12041,14 +12121,14 @@ public class Cassandra {
           case 0: // SUCCESS
             if (field.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list113 = iprot.readListBegin();
-                this.success = new ArrayList<KeySlice>(_list113.size);
-                for (int _i114 = 0; _i114 < _list113.size; ++_i114)
+                org.apache.thrift.protocol.TList _list117 = iprot.readListBegin();
+                this.success = new ArrayList<KeySlice>(_list117.size);
+                for (int _i118 = 0; _i118 < _list117.size; ++_i118)
                 {
-                  KeySlice _elem115; // required
-                  _elem115 = new KeySlice();
-                  _elem115.read(iprot);
-                  this.success.add(_elem115);
+                  KeySlice _elem119; // required
+                  _elem119 = new KeySlice();
+                  _elem119.read(iprot);
+                  this.success.add(_elem119);
                 }
                 iprot.readListEnd();
               }
@@ -12098,9 +12178,9 @@ public class Cassandra {
         oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size()));
-          for (KeySlice _iter116 : this.success)
+          for (KeySlice _iter120 : this.success)
           {
-            _iter116.write(oprot);
+            _iter120.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -13284,14 +13364,14 @@ public class Cassandra {
           case 0: // SUCCESS
             if (field.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list117 = iprot.readListBegin();
-                this.success = new ArrayList<KeySlice>(_list117.size);
-                for (int _i118 = 0; _i118 < _list117.size; ++_i118)
+                org.apache.thrift.protocol.TList _list121 = iprot.readListBegin();
+                this.success = new ArrayList<KeySlice>(_list121.size);
+                for (int _i122 = 0; _i122 < _list121.size; ++_i122)
                 {
-                  KeySlice _elem119; // required
-                  _elem119 = new KeySlice();
-                  _elem119.read(iprot);
-                  this.success.add(_elem119);
+                  KeySlice _elem123; // required
+                  _elem123 = new KeySlice();
+                  _elem123.read(iprot);
+                  this.success.add(_elem123);
                 }
                 iprot.readListEnd();
               }
@@ -13341,9 +13421,9 @@ public class Cassandra {
         oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size()));
-          for (KeySlice _iter120 : this.success)
+          for (KeySlice _iter124 : this.success)
           {
-            _iter120.write(oprot);
+            _iter124.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -18186,38 +18266,38 @@ public class Cassandra {
           case 1: // MUTATION_MAP
             if (field.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map121 = iprot.readMapBegin();
-                this.mutation_map = new HashMap<ByteBuffer,Map<String,List<Mutation>>>(2*_map121.size);
-                for (int _i122 = 0; _i122 < _map121.size; ++_i122)
+                org.apache.thrift.protocol.TMap _map125 = iprot.readMapBegin();
+                this.mutation_map = new HashMap<ByteBuffer,Map<String,List<Mutation>>>(2*_map125.size);
+                for (int _i126 = 0; _i126 < _map125.size; ++_i126)
                 {
-                  ByteBuffer _key123; // required
-                  Map<String,List<Mutation>> _val124; // required
-                  _key123 = iprot.readBinary();
+                  ByteBuffer _key127; // required
+                  Map<String,List<Mutation>> _val128; // required
+                  _key127 = iprot.readBinary();
                   {
-                    org.apache.thrift.protocol.TMap _map125 = iprot.readMapBegin();
-                    _val124 = new HashMap<String,List<Mutation>>(2*_map125.size);
-                    for (int _i126 = 0; _i126 < _map125.size; ++_i126)
+                    org.apache.thrift.protocol.TMap _map129 = iprot.readMapBegin();
+                    _val128 = new HashMap<String,List<Mutation>>(2*_map129.size);
+                    for (int _i130 = 0; _i130 < _map129.size; ++_i130)
                     {
-                      String _key127; // required
-                      List<Mutation> _val128; // required
-                      _key127 = iprot.readString();
+                      String _key131; // required
+                      List<Mutation> _val132; // required
+                      _key131 = iprot.readString();
                       {
-                        org.apache.thrift.protocol.TList _list129 = iprot.readListBegin();
-                        _val128 = new ArrayList<Mutation>(_list129.size);
-                        for (int _i130 = 0; _i130 < _list129.size; ++_i130)
+                        org.apache.thrift.protocol.TList _list133 = iprot.readListBegin();
+                        _val132 = new ArrayList<Mutation>(_list133.size);
+                        for (int _i134 = 0; _i134 < _list133.size; ++_i134)
                         {
-                          Mutation _elem131; // required
-                          _elem131 = new Mutation();
-                          _elem131.read(iprot);
-                          _val128.add(_elem131);
+                          Mutation _elem135; // required
+                          _elem135 = new Mutation();
+                          _elem135.read(iprot);
+                          _val132.add(_elem135);
                         }
                         iprot.readListEnd();
                       }
-                      _val124.put(_key127, _val128);
+                      _val128.put(_key131, _val132);
                     }
                     iprot.readMapEnd();
                   }
-                  this.mutation_map.put(_key123, _val124);
+                  this.mutation_map.put(_key127, _val128);
                 }
                 iprot.readMapEnd();
               }
@@ -18251,19 +18331,19 @@ public class Cassandra {
         oprot.writeFieldBegin(MUTATION_MAP_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.mutation_map.size()));
-          for (Map.Entry<ByteBuffer, Map<String,List<Mutation>>> _iter132 : this.mutation_map.entrySet())
+          for (Map.Entry<ByteBuffer, Map<String,List<Mutation>>> _iter136 : this.mutation_map.entrySet())
           {
-            oprot.writeBinary(_iter132.getKey());
+            oprot.writeBinary(_iter136.getKey());
             {
-              oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, _iter132.getValue().size()));
-              for (Map.Entry<String, List<Mutation>> _iter133 : _iter132.getValue().entrySet())
+              oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, _iter136.getValue().size()));
+              for (Map.Entry<String, List<Mutation>> _iter137 : _iter136.getValue().entrySet())
               {
-                oprot.writeString(_iter133.getKey());
+                oprot.writeString(_iter137.getKey());
                 {
-                  oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter133.getValue().size()));
-                  for (Mutation _iter134 : _iter133.getValue())
+                  oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter137.getValue().size()));
+                  for (Mutation _iter138 : _iter137.getValue())
                   {
-                    _iter134.write(oprot);
+                    _iter138.write(oprot);
                   }
                   oprot.writeListEnd();
                 }
@@ -20172,25 +20252,25 @@ public class Cassandra {
           case 0: // SUCCESS
             if (field.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map135 = iprot.readMapBegin();
-                this.success = new HashMap<String,List<String>>(2*_map135.size);
-                for (int _i136 = 0; _i136 < _map135.size; ++_i136)
+                org.apache.thrift.protocol.TMap _map139 = iprot.readMapBegin();
+                this.success = new HashMap<String,List<String>>(2*_map139.size);
+                for (int _i140 = 0; _i140 < _map139.size; ++_i140)
                 {
-                  String _key137; // required
-                  List<String> _val138; // required
-                  _key137 = iprot.readString();
+                  String _key141; // required
+                  List<String> _val142; // required
+                  _key141 = iprot.readString();
                   {
-                    org.apache.thrift.protocol.TList _list139 = iprot.readListBegin();
-                    _val138 = new ArrayList<String>(_list139.size);
-                    for (int _i140 = 0; _i140 < _list139.size; ++_i140)
+                    org.apache.thrift.protocol.TList _list143 = iprot.readListBegin();
+                    _val142 = new ArrayList<String>(_list143.size);
+                    for (int _i144 = 0; _i144 < _list143.size; ++_i144)
                     {
-                      String _elem141; // required
-                      _elem141 = iprot.readString();
-                      _val138.add(_elem141);
+                      String _elem145; // required
+                      _elem145 = iprot.readString();
+                      _val142.add(_elem145);
                     }
                     iprot.readListEnd();
                   }
-                  this.success.put(_key137, _val138);
+                  this.success.put(_key141, _val142);
                 }
                 iprot.readMapEnd();
               }
@@ -20224,14 +20304,14 @@ public class Cassandra {
         oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, this.success.size()));
-          for (Map.Entry<String, List<String>> _iter142 : this.success.entrySet())
+          for (Map.Entry<String, List<String>> _iter146 : this.success.entrySet())
           {
-            oprot.writeString(_iter142.getKey());
+            oprot.writeString(_iter146.getKey());
             {
-              oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, _iter142.getValue().size()));
-              for (String _iter143 : _iter142.getValue())
+              oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, _iter146.getValue().size()));
+              for (String _iter147 : _iter146.getValue())
               {
-                oprot.writeString(_iter143);
+                oprot.writeString(_iter147);
               }
               oprot.writeListEnd();
             }
@@ -20830,14 +20910,14 @@ public class Cassandra {
           case 0: // SUCCESS
             if (field.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list144 = iprot.readListBegin();
-                this.success = new ArrayList<KsDef>(_list144.size);
-                for (int _i145 = 0; _i145 < _list144.size; ++_i145)
+                org.apache.thrift.protocol.TList _list148 = iprot.readListBegin();
+                this.success = new ArrayList<KsDef>(_list148.size);
+                for (int _i149 = 0; _i149 < _list148.size; ++_i149)
                 {
-                  KsDef _elem146; // required
-                  _elem146 = new KsDef();
-                  _elem146.read(iprot);
-                  this.success.add(_elem146);
+                  KsDef _elem150; // required
+                  _elem150 = new KsDef();
+                  _elem150.read(iprot);
+                  this.success.add(_elem150);
                 }
                 iprot.readListEnd();
               }
@@ -20871,9 +20951,9 @@ public class Cassandra {
         oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size()));
-          for (KsDef _iter147 : this.success)
+          for (KsDef _iter151 : this.success)
           {
-            _iter147.write(oprot);
+            _iter151.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -22586,14 +22666,14 @@ public class Cassandra {
           case 0: // SUCCESS
             if (field.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list148 = iprot.readListBegin();
-                this.success = new ArrayList<TokenRange>(_list148.size);
-                for (int _i149 = 0; _i149 < _list148.size; ++_i149)
+                org.apache.thrift.protocol.TList _list152 = iprot.readListBegin();
+                this.success = new ArrayList<TokenRange>(_list152.size);
+                for (int _i153 = 0; _i153 < _list152.size; ++_i153)
                 {
-                  TokenRange _elem150; // required
-                  _elem150 = new TokenRange();
-                  _elem150.read(iprot);
-                  this.success.add(_elem150);
+                  TokenRange _elem154; // required
+                  _elem154 = new TokenRange();
+                  _elem154.read(iprot);
+                  this.success.add(_elem154);
                 }
                 iprot.readListEnd();
               }
@@ -22627,9 +22707,9 @@ public class Cassandra {
         oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size()));
-          for (TokenRange _iter151 : this.success)
+          for (TokenRange _iter155 : this.success)
           {
-            _iter151.write(oprot);
+            _iter155.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -25433,13 +25513,13 @@ public class Cassandra {
           case 0: // SUCCESS
             if (field.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list152 = iprot.readListBegin();
-                this.success = new ArrayList<String>(_list152.size);
-                for (int _i153 = 0; _i153 < _list152.size; ++_i153)
+                org.apache.thrift.protocol.TList _list156 = iprot.readListBegin();
+                this.success = new ArrayList<String>(_list156.size);
+                for (int _i157 = 0; _i157 < _list156.size; ++_i157)
                 {
-                  String _elem154; // required
-                  _elem154 = iprot.readString();
-                  this.success.add(_elem154);
+                  String _elem158; // required
+                  _elem158 = iprot.readString();
+                  this.success.add(_elem158);
                 }
                 iprot.readListEnd();
               }
@@ -25473,9 +25553,9 @@ public class Cassandra {
         oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.success.size()));
-          for (String _iter155 : this.success)
+          for (String _iter159 : this.success)
           {
-            oprot.writeString(_iter155);
+            oprot.writeString(_iter159);
           }
           oprot.writeListEnd();
         }
@@ -32612,13 +32692,13 @@ public class Cassandra {
           case 2: // VALUES
             if (field.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list156 = iprot.readListBegin();
-                this.values = new ArrayList<ByteBuffer>(_list156.size);
-                for (int _i157 = 0; _i157 < _list156.size; ++_i157)
+                org.apache.thrift.protocol.TList _list160 = iprot.readListBegin();
+                this.values = new ArrayList<ByteBuffer>(_list160.size);
+                for (int _i161 = 0; _i161 < _list160.size; ++_i161)
                 {
-                  ByteBuffer _elem158; // required
-                  _elem158 = iprot.readBinary();
-                  this.values.add(_elem158);
+                  ByteBuffer _elem162; // required
+                  _elem162 = iprot.readBinary();
+                  this.values.add(_elem162);
                 }
                 iprot.readListEnd();
               }
@@ -32651,9 +32731,9 @@ public class Cassandra {
         oprot.writeFieldBegin(VALUES_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.values.size()));
-          for (ByteBuffer _iter159 : this.values)
+          for (ByteBuffer _iter163 : this.values)
           {
-            oprot.writeBinary(_iter159);
+            oprot.writeBinary(_iter163);
           }
           oprot.writeListEnd();
         }
@@ -33389,4 +33469,615 @@ public class Cassandra {
 
   }
 
+  public static class set_cql_version_args implements org.apache.thrift.TBase<set_cql_version_args, set_cql_version_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("set_cql_version_args");
+
+    private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+    public String version; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      VERSION((short)1, "version");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // VERSION
+            return VERSION;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(set_cql_version_args.class, metaDataMap);
+    }
+
+    public set_cql_version_args() {
+    }
+
+    public set_cql_version_args(
+      String version)
+    {
+      this();
+      this.version = version;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public set_cql_version_args(set_cql_version_args other) {
+      if (other.isSetVersion()) {
+        this.version = other.version;
+      }
+    }
+
+    public set_cql_version_args deepCopy() {
+      return new set_cql_version_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.version = null;
+    }
+
+    public String getVersion() {
+      return this.version;
+    }
+
+    public set_cql_version_args setVersion(String version) {
+      this.version = version;
+      return this;
+    }
+
+    public void unsetVersion() {
+      this.version = null;
+    }
+
+    /** Returns true if field version is set (has been assigned a value) and false otherwise */
+    public boolean isSetVersion() {
+      return this.version != null;
+    }
+
+    public void setVersionIsSet(boolean value) {
+      if (!value) {
+        this.version = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case VERSION:
+        if (value == null) {
+          unsetVersion();
+        } else {
+          setVersion((String)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case VERSION:
+        return getVersion();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case VERSION:
+        return isSetVersion();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof set_cql_version_args)
+        return this.equals((set_cql_version_args)that);
+      return false;
+    }
+
+    public boolean equals(set_cql_version_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_version = true && this.isSetVersion();
+      boolean that_present_version = true && that.isSetVersion();
+      if (this_present_version || that_present_version) {
+        if (!(this_present_version && that_present_version))
+          return false;
+        if (!this.version.equals(that.version))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_version = true && (isSetVersion());
+      builder.append(present_version);
+      if (present_version)
+        builder.append(version);
+
+      return builder.toHashCode();
+    }
+
+    public int compareTo(set_cql_version_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      set_cql_version_args typedOther = (set_cql_version_args)other;
+
+      lastComparison = Boolean.valueOf(isSetVersion()).compareTo(typedOther.isSetVersion());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetVersion()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, typedOther.version);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // VERSION
+            if (field.type == org.apache.thrift.protocol.TType.STRING) {
+              this.version = iprot.readString();
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.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(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (this.version != null) {
+        oprot.writeFieldBegin(VERSION_FIELD_DESC);
+        oprot.writeString(this.version);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("set_cql_version_args(");
+      boolean first = true;
+
+      sb.append("version:");
+      if (this.version == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.version);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      if (version == null) {
+        throw new org.apache.thrift.protocol.TProtocolException("Required field 'version' was not present! Struct: " + toString());
+      }
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
+  public static class set_cql_version_result implements org.apache.thrift.TBase<set_cql_version_result, set_cql_version_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("set_cql_version_result");
+
+    private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    public InvalidRequestException ire; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      IRE((short)1, "ire");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // IRE
+            return IRE;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.IRE, new org.apache.thrift.meta_data.FieldMetaData("ire", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(set_cql_version_result.class, metaDataMap);
+    }
+
+    public set_cql_version_result() {
+    }
+
+    public set_cql_version_result(
+      InvalidRequestException ire)
+    {
+      this();
+      this.ire = ire;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public set_cql_version_result(set_cql_version_result other) {
+      if (other.isSetIre()) {
+        this.ire = new InvalidRequestException(other.ire);
+      }
+    }
+
+    public set_cql_version_result deepCopy() {
+      return new set_cql_version_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.ire = null;
+    }
+
+    public InvalidRequestException getIre() {
+      return this.ire;
+    }
+
+    public set_cql_version_result setIre(InvalidRequestException ire) {
+      this.ire = ire;
+      return this;
+    }
+
+    public void unsetIre() {
+      this.ire = null;
+    }
+
+    /** Returns true if field ire is set (has been assigned a value) and false otherwise */
+    public boolean isSetIre() {
+      return this.ire != null;
+    }
+
+    public void setIreIsSet(boolean value) {
+      if (!value) {
+        this.ire = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case IRE:
+        if (value == null) {
+          unsetIre();
+        } else {
+          setIre((InvalidRequestException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case IRE:
+        return getIre();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case IRE:
+        return isSetIre();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof set_cql_version_result)
+        return this.equals((set_cql_version_result)that);
+      return false;
+    }
+
+    public boolean equals(set_cql_version_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_ire = true && this.isSetIre();
+      boolean that_present_ire = true && that.isSetIre();
+      if (this_present_ire || that_present_ire) {
+        if (!(this_present_ire && that_present_ire))
+          return false;
+        if (!this.ire.equals(that.ire))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      return builder.toHashCode();
+    }
+
+    public int compareTo(set_cql_version_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      set_cql_version_result typedOther = (set_cql_version_result)other;
+
+      lastComparison = Boolean.valueOf(isSetIre()).compareTo(typedOther.isSetIre());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetIre()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ire, typedOther.ire);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField field;
+      iprot.readStructBegin();
+      while (true)
+      {
+        field = iprot.readFieldBegin();
+        if (field.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (field.id) {
+          case 1: // IRE
+            if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
+              this.ire = new InvalidRequestException();
+              this.ire.read(iprot);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.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(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      oprot.writeStructBegin(STRUCT_DESC);
+
+      if (this.isSetIre()) {
+        oprot.writeFieldBegin(IRE_FIELD_DESC);
+        this.ire.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("set_cql_version_result(");
+      boolean first = true;
+
+      sb.append("ire:");
+      if (this.ire == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.ire);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+  }
+
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/087d24a9/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
index 2e7d892..8593794 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
@@ -67,6 +67,8 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
   private static final org.apache.thrift.protocol.TField COMPRESSION_OPTIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("compression_options", org.apache.thrift.protocol.TType.MAP, (short)32);
   private static final org.apache.thrift.protocol.TField BLOOM_FILTER_FP_CHANCE_FIELD_DESC = new org.apache.thrift.protocol.TField("bloom_filter_fp_chance", org.apache.thrift.protocol.TType.DOUBLE, (short)33);
   private static final org.apache.thrift.protocol.TField CACHING_FIELD_DESC = new org.apache.thrift.protocol.TField("caching", org.apache.thrift.protocol.TType.STRING, (short)34);
+  private static final org.apache.thrift.protocol.TField COLUMN_ALIASES_FIELD_DESC = new org.apache.thrift.protocol.TField("column_aliases", org.apache.thrift.protocol.TType.LIST, (short)35);
+  private static final org.apache.thrift.protocol.TField VALUE_ALIAS_FIELD_DESC = new org.apache.thrift.protocol.TField("value_alias", org.apache.thrift.protocol.TType.STRING, (short)36);
 
   public String keyspace; // required
   public String name; // required
@@ -90,6 +92,8 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
   public Map<String,String> compression_options; // required
   public double bloom_filter_fp_chance; // required
   public String caching; // required
+  public List<ByteBuffer> column_aliases; // required
+  public ByteBuffer value_alias; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -114,7 +118,9 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     COMPACTION_STRATEGY_OPTIONS((short)30, "compaction_strategy_options"),
     COMPRESSION_OPTIONS((short)32, "compression_options"),
     BLOOM_FILTER_FP_CHANCE((short)33, "bloom_filter_fp_chance"),
-    CACHING((short)34, "caching");
+    CACHING((short)34, "caching"),
+    COLUMN_ALIASES((short)35, "column_aliases"),
+    VALUE_ALIAS((short)36, "value_alias");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -173,6 +179,10 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
           return BLOOM_FILTER_FP_CHANCE;
         case 34: // CACHING
           return CACHING;
+        case 35: // COLUMN_ALIASES
+          return COLUMN_ALIASES;
+        case 36: // VALUE_ALIAS
+          return VALUE_ALIAS;
         default:
           return null;
       }
@@ -275,6 +285,11 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
     tmpMap.put(_Fields.CACHING, new org.apache.thrift.meta_data.FieldMetaData("caching", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.COLUMN_ALIASES, new org.apache.thrift.meta_data.FieldMetaData("column_aliases", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING            , true))));
+    tmpMap.put(_Fields.VALUE_ALIAS, new org.apache.thrift.meta_data.FieldMetaData("value_alias", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CfDef.class, metaDataMap);
   }
@@ -384,6 +399,19 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     if (other.isSetCaching()) {
       this.caching = other.caching;
     }
+    if (other.isSetColumn_aliases()) {
+      List<ByteBuffer> __this__column_aliases = new ArrayList<ByteBuffer>();
+      for (ByteBuffer other_element : other.column_aliases) {
+        ByteBuffer temp_binary_element = org.apache.thrift.TBaseHelper.copyBinary(other_element);
+;
+        __this__column_aliases.add(temp_binary_element);
+      }
+      this.column_aliases = __this__column_aliases;
+    }
+    if (other.isSetValue_alias()) {
+      this.value_alias = org.apache.thrift.TBaseHelper.copyBinary(other.value_alias);
+;
+    }
   }
 
   public CfDef deepCopy() {
@@ -425,6 +453,8 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     this.bloom_filter_fp_chance = 0.0;
     this.caching = "keys_only";
 
+    this.column_aliases = null;
+    this.value_alias = null;
   }
 
   public String getKeyspace() {
@@ -994,6 +1024,79 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     }
   }
 
+  public int getColumn_aliasesSize() {
+    return (this.column_aliases == null) ? 0 : this.column_aliases.size();
+  }
+
+  public java.util.Iterator<ByteBuffer> getColumn_aliasesIterator() {
+    return (this.column_aliases == null) ? null : this.column_aliases.iterator();
+  }
+
+  public void addToColumn_aliases(ByteBuffer elem) {
+    if (this.column_aliases == null) {
+      this.column_aliases = new ArrayList<ByteBuffer>();
+    }
+    this.column_aliases.add(elem);
+  }
+
+  public List<ByteBuffer> getColumn_aliases() {
+    return this.column_aliases;
+  }
+
+  public CfDef setColumn_aliases(List<ByteBuffer> column_aliases) {
+    this.column_aliases = column_aliases;
+    return this;
+  }
+
+  public void unsetColumn_aliases() {
+    this.column_aliases = null;
+  }
+
+  /** Returns true if field column_aliases is set (has been assigned a value) and false otherwise */
+  public boolean isSetColumn_aliases() {
+    return this.column_aliases != null;
+  }
+
+  public void setColumn_aliasesIsSet(boolean value) {
+    if (!value) {
+      this.column_aliases = null;
+    }
+  }
+
+  public byte[] getValue_alias() {
+    setValue_alias(org.apache.thrift.TBaseHelper.rightSize(value_alias));
+    return value_alias == null ? null : value_alias.array();
+  }
+
+  public ByteBuffer bufferForValue_alias() {
+    return value_alias;
+  }
+
+  public CfDef setValue_alias(byte[] value_alias) {
+    setValue_alias(value_alias == null ? (ByteBuffer)null : ByteBuffer.wrap(value_alias));
+    return this;
+  }
+
+  public CfDef setValue_alias(ByteBuffer value_alias) {
+    this.value_alias = value_alias;
+    return this;
+  }
+
+  public void unsetValue_alias() {
+    this.value_alias = null;
+  }
+
+  /** Returns true if field value_alias is set (has been assigned a value) and false otherwise */
+  public boolean isSetValue_alias() {
+    return this.value_alias != null;
+  }
+
+  public void setValue_aliasIsSet(boolean value) {
+    if (!value) {
+      this.value_alias = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case KEYSPACE:
@@ -1172,6 +1275,22 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
       }
       break;
 
+    case COLUMN_ALIASES:
+      if (value == null) {
+        unsetColumn_aliases();
+      } else {
+        setColumn_aliases((List<ByteBuffer>)value);
+      }
+      break;
+
+    case VALUE_ALIAS:
+      if (value == null) {
+        unsetValue_alias();
+      } else {
+        setValue_alias((ByteBuffer)value);
+      }
+      break;
+
     }
   }
 
@@ -1243,6 +1362,12 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     case CACHING:
       return getCaching();
 
+    case COLUMN_ALIASES:
+      return getColumn_aliases();
+
+    case VALUE_ALIAS:
+      return getValue_alias();
+
     }
     throw new IllegalStateException();
   }
@@ -1298,6 +1423,10 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
       return isSetBloom_filter_fp_chance();
     case CACHING:
       return isSetCaching();
+    case COLUMN_ALIASES:
+      return isSetColumn_aliases();
+    case VALUE_ALIAS:
+      return isSetValue_alias();
     }
     throw new IllegalStateException();
   }
@@ -1513,6 +1642,24 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         return false;
     }
 
+    boolean this_present_column_aliases = true && this.isSetColumn_aliases();
+    boolean that_present_column_aliases = true && that.isSetColumn_aliases();
+    if (this_present_column_aliases || that_present_column_aliases) {
+      if (!(this_present_column_aliases && that_present_column_aliases))
+        return false;
+      if (!this.column_aliases.equals(that.column_aliases))
+        return false;
+    }
+
+    boolean this_present_value_alias = true && this.isSetValue_alias();
+    boolean that_present_value_alias = true && that.isSetValue_alias();
+    if (this_present_value_alias || that_present_value_alias) {
+      if (!(this_present_value_alias && that_present_value_alias))
+        return false;
+      if (!this.value_alias.equals(that.value_alias))
+        return false;
+    }
+
     return true;
   }
 
@@ -1630,6 +1777,16 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     if (present_caching)
       builder.append(caching);
 
+    boolean present_column_aliases = true && (isSetColumn_aliases());
+    builder.append(present_column_aliases);
+    if (present_column_aliases)
+      builder.append(column_aliases);
+
+    boolean present_value_alias = true && (isSetValue_alias());
+    builder.append(present_value_alias);
+    if (present_value_alias)
+      builder.append(value_alias);
+
     return builder.toHashCode();
   }
 
@@ -1861,6 +2018,26 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetColumn_aliases()).compareTo(typedOther.isSetColumn_aliases());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetColumn_aliases()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_aliases, typedOther.column_aliases);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetValue_alias()).compareTo(typedOther.isSetValue_alias());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetValue_alias()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value_alias, typedOther.value_alias);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -2075,6 +2252,30 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
+        case 35: // COLUMN_ALIASES
+          if (field.type == org.apache.thrift.protocol.TType.LIST) {
+            {
+              org.apache.thrift.protocol.TList _list57 = iprot.readListBegin();
+              this.column_aliases = new ArrayList<ByteBuffer>(_list57.size);
+              for (int _i58 = 0; _i58 < _list57.size; ++_i58)
+              {
+                ByteBuffer _elem59; // required
+                _elem59 = iprot.readBinary();
+                this.column_aliases.add(_elem59);
+              }
+              iprot.readListEnd();
+            }
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        case 36: // VALUE_ALIAS
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.value_alias = iprot.readBinary();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
         default:
           org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       }
@@ -2138,9 +2339,9 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         oprot.writeFieldBegin(COLUMN_METADATA_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.column_metadata.size()));
-          for (ColumnDef _iter57 : this.column_metadata)
+          for (ColumnDef _iter60 : this.column_metadata)
           {
-            _iter57.write(oprot);
+            _iter60.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -2210,10 +2411,10 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         oprot.writeFieldBegin(COMPACTION_STRATEGY_OPTIONS_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.compaction_strategy_options.size()));
-          for (Map.Entry<String, String> _iter58 : this.compaction_strategy_options.entrySet())
+          for (Map.Entry<String, String> _iter61 : this.compaction_strategy_options.entrySet())
           {
-            oprot.writeString(_iter58.getKey());
-            oprot.writeString(_iter58.getValue());
+            oprot.writeString(_iter61.getKey());
+            oprot.writeString(_iter61.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -2225,10 +2426,10 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         oprot.writeFieldBegin(COMPRESSION_OPTIONS_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.compression_options.size()));
-          for (Map.Entry<String, String> _iter59 : this.compression_options.entrySet())
+          for (Map.Entry<String, String> _iter62 : this.compression_options.entrySet())
           {
-            oprot.writeString(_iter59.getKey());
-            oprot.writeString(_iter59.getValue());
+            oprot.writeString(_iter62.getKey());
+            oprot.writeString(_iter62.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -2247,6 +2448,27 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         oprot.writeFieldEnd();
       }
     }
+    if (this.column_aliases != null) {
+      if (isSetColumn_aliases()) {
+        oprot.writeFieldBegin(COLUMN_ALIASES_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.column_aliases.size()));
+          for (ByteBuffer _iter63 : this.column_aliases)
+          {
+            oprot.writeBinary(_iter63);
+          }
+          oprot.writeListEnd();
+        }
+        oprot.writeFieldEnd();
+      }
+    }
+    if (this.value_alias != null) {
+      if (isSetValue_alias()) {
+        oprot.writeFieldBegin(VALUE_ALIAS_FIELD_DESC);
+        oprot.writeBinary(this.value_alias);
+        oprot.writeFieldEnd();
+      }
+    }
     oprot.writeFieldStop();
     oprot.writeStructEnd();
   }
@@ -2439,6 +2661,26 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
       }
       first = false;
     }
+    if (isSetColumn_aliases()) {
+      if (!first) sb.append(", ");
+      sb.append("column_aliases:");
+      if (this.column_aliases == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.column_aliases);
+      }
+      first = false;
+    }
+    if (isSetValue_alias()) {
+      if (!first) sb.append(", ");
+      sb.append("value_alias:");
+      if (this.value_alias == null) {
+        sb.append("null");
+      } else {
+        org.apache.thrift.TBaseHelper.toString(this.value_alias, sb);
+      }
+      first = false;
+    }
     sb.append(")");
     return sb.toString();
   }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/087d24a9/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
index 9c8ab64..be4e5aa 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
@@ -44,6 +44,6 @@ import org.slf4j.LoggerFactory;
 
 public class Constants {
 
-  public static final String VERSION = "19.25.0";
+  public static final String VERSION = "19.26.0";
 
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/087d24a9/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlMetadata.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlMetadata.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlMetadata.java
index f7df6b6..ff0bc4a 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlMetadata.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlMetadata.java
@@ -554,15 +554,15 @@ public class CqlMetadata implements org.apache.thrift.TBase<CqlMetadata, CqlMeta
         case 1: // NAME_TYPES
           if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              org.apache.thrift.protocol.TMap _map73 = iprot.readMapBegin();
-              this.name_types = new HashMap<ByteBuffer,String>(2*_map73.size);
-              for (int _i74 = 0; _i74 < _map73.size; ++_i74)
+              org.apache.thrift.protocol.TMap _map77 = iprot.readMapBegin();
+              this.name_types = new HashMap<ByteBuffer,String>(2*_map77.size);
+              for (int _i78 = 0; _i78 < _map77.size; ++_i78)
               {
-                ByteBuffer _key75; // required
-                String _val76; // required
-                _key75 = iprot.readBinary();
-                _val76 = iprot.readString();
-                this.name_types.put(_key75, _val76);
+                ByteBuffer _key79; // required
+                String _val80; // required
+                _key79 = iprot.readBinary();
+                _val80 = iprot.readString();
+                this.name_types.put(_key79, _val80);
               }
               iprot.readMapEnd();
             }
@@ -573,15 +573,15 @@ public class CqlMetadata implements org.apache.thrift.TBase<CqlMetadata, CqlMeta
         case 2: // VALUE_TYPES
           if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              org.apache.thrift.protocol.TMap _map77 = iprot.readMapBegin();
-              this.value_types = new HashMap<ByteBuffer,String>(2*_map77.size);
-              for (int _i78 = 0; _i78 < _map77.size; ++_i78)
+              org.apache.thrift.protocol.TMap _map81 = iprot.readMapBegin();
+              this.value_types = new HashMap<ByteBuffer,String>(2*_map81.size);
+              for (int _i82 = 0; _i82 < _map81.size; ++_i82)
               {
-                ByteBuffer _key79; // required
-                String _val80; // required
-                _key79 = iprot.readBinary();
-                _val80 = iprot.readString();
-                this.value_types.put(_key79, _val80);
+                ByteBuffer _key83; // required
+                String _val84; // required
+                _key83 = iprot.readBinary();
+                _val84 = iprot.readString();
+                this.value_types.put(_key83, _val84);
               }
               iprot.readMapEnd();
             }
@@ -622,10 +622,10 @@ public class CqlMetadata implements org.apache.thrift.TBase<CqlMetadata, CqlMeta
       oprot.writeFieldBegin(NAME_TYPES_FIELD_DESC);
       {
         oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.name_types.size()));
-        for (Map.Entry<ByteBuffer, String> _iter81 : this.name_types.entrySet())
+        for (Map.Entry<ByteBuffer, String> _iter85 : this.name_types.entrySet())
         {
-          oprot.writeBinary(_iter81.getKey());
-          oprot.writeString(_iter81.getValue());
+          oprot.writeBinary(_iter85.getKey());
+          oprot.writeString(_iter85.getValue());
         }
         oprot.writeMapEnd();
       }
@@ -635,10 +635,10 @@ public class CqlMetadata implements org.apache.thrift.TBase<CqlMetadata, CqlMeta
       oprot.writeFieldBegin(VALUE_TYPES_FIELD_DESC);
       {
         oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.value_types.size()));
-        for (Map.Entry<ByteBuffer, String> _iter82 : this.value_types.entrySet())
+        for (Map.Entry<ByteBuffer, String> _iter86 : this.value_types.entrySet())
         {
-          oprot.writeBinary(_iter82.getKey());
-          oprot.writeString(_iter82.getValue());
+          oprot.writeBinary(_iter86.getKey());
+          oprot.writeString(_iter86.getValue());
         }
         oprot.writeMapEnd();
       }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/087d24a9/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
index 7c0129f..01fe347 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
@@ -541,14 +541,14 @@ public class CqlResult implements org.apache.thrift.TBase<CqlResult, CqlResult._
         case 2: // ROWS
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list83 = iprot.readListBegin();
-              this.rows = new ArrayList<CqlRow>(_list83.size);
-              for (int _i84 = 0; _i84 < _list83.size; ++_i84)
+              org.apache.thrift.protocol.TList _list87 = iprot.readListBegin();
+              this.rows = new ArrayList<CqlRow>(_list87.size);
+              for (int _i88 = 0; _i88 < _list87.size; ++_i88)
               {
-                CqlRow _elem85; // required
-                _elem85 = new CqlRow();
-                _elem85.read(iprot);
-                this.rows.add(_elem85);
+                CqlRow _elem89; // required
+                _elem89 = new CqlRow();
+                _elem89.read(iprot);
+                this.rows.add(_elem89);
               }
               iprot.readListEnd();
             }
@@ -597,9 +597,9 @@ public class CqlResult implements org.apache.thrift.TBase<CqlResult, CqlResult._
         oprot.writeFieldBegin(ROWS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.rows.size()));
-          for (CqlRow _iter86 : this.rows)
+          for (CqlRow _iter90 : this.rows)
           {
-            _iter86.write(oprot);
+            _iter90.write(oprot);
           }
           oprot.writeListEnd();
         }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/087d24a9/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
index df7ec85..ead781b 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
@@ -395,14 +395,14 @@ public class CqlRow implements org.apache.thrift.TBase<CqlRow, CqlRow._Fields>,
         case 2: // COLUMNS
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list69 = iprot.readListBegin();
-              this.columns = new ArrayList<Column>(_list69.size);
-              for (int _i70 = 0; _i70 < _list69.size; ++_i70)
+              org.apache.thrift.protocol.TList _list73 = iprot.readListBegin();
+              this.columns = new ArrayList<Column>(_list73.size);
+              for (int _i74 = 0; _i74 < _list73.size; ++_i74)
               {
-                Column _elem71; // required
-                _elem71 = new Column();
-                _elem71.read(iprot);
-                this.columns.add(_elem71);
+                Column _elem75; // required
+                _elem75 = new Column();
+                _elem75.read(iprot);
+                this.columns.add(_elem75);
               }
               iprot.readListEnd();
             }
@@ -434,9 +434,9 @@ public class CqlRow implements org.apache.thrift.TBase<CqlRow, CqlRow._Fields>,
       oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
       {
         oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.columns.size()));
-        for (Column _iter72 : this.columns)
+        for (Column _iter76 : this.columns)
         {
-          _iter72.write(oprot);
+          _iter76.write(oprot);
         }
         oprot.writeListEnd();
       }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/087d24a9/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
index f721a04..bc552ab 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
@@ -718,15 +718,15 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
         case 3: // STRATEGY_OPTIONS
           if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              org.apache.thrift.protocol.TMap _map60 = iprot.readMapBegin();
-              this.strategy_options = new HashMap<String,String>(2*_map60.size);
-              for (int _i61 = 0; _i61 < _map60.size; ++_i61)
+              org.apache.thrift.protocol.TMap _map64 = iprot.readMapBegin();
+              this.strategy_options = new HashMap<String,String>(2*_map64.size);
+              for (int _i65 = 0; _i65 < _map64.size; ++_i65)
               {
-                String _key62; // required
-                String _val63; // required
-                _key62 = iprot.readString();
-                _val63 = iprot.readString();
-                this.strategy_options.put(_key62, _val63);
+                String _key66; // required
+                String _val67; // required
+                _key66 = iprot.readString();
+                _val67 = iprot.readString();
+                this.strategy_options.put(_key66, _val67);
               }
               iprot.readMapEnd();
             }
@@ -745,14 +745,14 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
         case 5: // CF_DEFS
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list64 = iprot.readListBegin();
-              this.cf_defs = new ArrayList<CfDef>(_list64.size);
-              for (int _i65 = 0; _i65 < _list64.size; ++_i65)
+              org.apache.thrift.protocol.TList _list68 = iprot.readListBegin();
+              this.cf_defs = new ArrayList<CfDef>(_list68.size);
+              for (int _i69 = 0; _i69 < _list68.size; ++_i69)
               {
-                CfDef _elem66; // required
-                _elem66 = new CfDef();
-                _elem66.read(iprot);
-                this.cf_defs.add(_elem66);
+                CfDef _elem70; // required
+                _elem70 = new CfDef();
+                _elem70.read(iprot);
+                this.cf_defs.add(_elem70);
               }
               iprot.readListEnd();
             }
@@ -798,10 +798,10 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
         oprot.writeFieldBegin(STRATEGY_OPTIONS_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.strategy_options.size()));
-          for (Map.Entry<String, String> _iter67 : this.strategy_options.entrySet())
+          for (Map.Entry<String, String> _iter71 : this.strategy_options.entrySet())
           {
-            oprot.writeString(_iter67.getKey());
-            oprot.writeString(_iter67.getValue());
+            oprot.writeString(_iter71.getKey());
+            oprot.writeString(_iter71.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -817,9 +817,9 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
       oprot.writeFieldBegin(CF_DEFS_FIELD_DESC);
       {
         oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.cf_defs.size()));
-        for (CfDef _iter68 : this.cf_defs)
+        for (CfDef _iter72 : this.cf_defs)
         {
-          _iter68.write(oprot);
+          _iter72.write(oprot);
         }
         oprot.writeListEnd();
       }


Mime
View raw message