cassandra 0.7.6 → 0.8.0

data/lib/cassandra.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'thrift_client'
-require 'json'
+require 'json' unless defined?(JSON)
 require 'simple_uuid'
 include SimpleUUID
 here = File.expand_path(File.dirname(__FILE__))

data/lib/cassandra/cassandra.rb

@@ -69,19 +69,9 @@ class Cassandra
     @servers = Array(servers)
   end
 
-  def client
-    return @client if defined?(@client)
-    client!
-  end
-
-  def client!
-    @client = raw_client
-    unless (keyspaces = client.get_string_list_property("keyspaces")).include?(@keyspace)
-      raise AccessError, "Keyspace #{@keyspace.inspect} not found. Available: #{keyspaces.inspect}"
-    end
-    @servers = all_nodes
+  def disconnect!
     @client.disconnect!
-    @client = raw_client
+    @client = nil
   end
 
   def keyspaces
@@ -103,12 +93,24 @@ class Cassandra
     column_family, _, _, options = extract_and_validate_params(column_family, key, [options], WRITE_DEFAULTS)
 
     timestamp = options[:timestamp] || Time.stamp
-    cfmap = hash_to_cfmap(column_family, hash, timestamp)
-    mutation = [:insert, [key, cfmap, options[:consistency]]]
+    mutation_map = if is_super(column_family)
+      {
+        key => {
+          column_family => hash.collect{|k,v| _super_insert_mutation(column_family, k, v, timestamp) }
+        }
+      }
+    else
+      {
+        key => {
+          column_family => hash.collect{|k,v| _standard_insert_mutation(column_family, k, v, timestamp)}
+        }
+      }
+    end
 
-    @batch ? @batch << mutation : _insert(*mutation[1])
+    @batch ? @batch << [mutation_map, options[:consistency]] : _mutate(mutation_map, options[:consistency])
   end
 
+  
   ## Delete
 
   # _mutate the element at the column_family:key:[column]:[sub_column]
@@ -131,8 +133,8 @@ class Cassandra
   # FIXME May not currently delete all records without multiple calls. Waiting
   # for ranged remove support in Cassandra.
   def clear_column_family!(column_family, options = {})
-    while (keys = get_range(column_family, :count => 100)).length > 0
-      keys.each { |key| remove(column_family, key, options) }
+    each_key(column_family) do |key|
+      remove(column_family, key, options)
     end
   end
 
@@ -220,14 +222,7 @@ class Cassandra
   # to be partitioned with OrderPreservingHash. Supports the <tt>:start</tt>,
   # <tt>:finish</tt>, and <tt>:consistency</tt> options.
   def count_range(column_family, options = {})
-    count = 0
-    l = []
-    start_key = options[:start]
-    while (l = get_range(column_family, options.merge(:count => 1000, :start => start_key))).size > 0
-      count += l.size
-      start_key = l.last.succ
-    end
-    count
+    get_range(column_family, options).select{|r| r.columns.length > 0}.compact.length
   end
 
   # Open a batch operation and yield. Inserts and deletes will be queued until
@@ -244,20 +239,20 @@ class Cassandra
 
     @batch.each do |mutation|
       case mutation.first
-      when :insert
-        _insert(*mutation[1])
       when :remove
         _remove(*mutation[1])
+      else
+        _mutate(*mutation)
       end
     end
   ensure
     @batch = nil
   end
 
-  private
+  protected
 
   def calling_method
-     "#{self.class}##{caller[0].split('`').last[0..-3]}"
+    "#{self.class}##{caller[0].split('`').last[0..-3]}"
   end
 
   # Roll up queued mutations, to improve atomicity.
@@ -273,13 +268,31 @@ class Cassandra
     end
   end
 
-  def raw_client
+  def client
+    reconnect! if @client.nil?
+    @client
+  end
+
+  def reconnect!
+    @servers = all_nodes
+    @client = new_client
+    check_keyspace
+  end
+
+  def check_keyspace
+    unless (keyspaces = client.get_string_list_property("keyspaces")).include?(@keyspace)
+      raise AccessError, "Keyspace #{@keyspace.inspect} not found. Available: #{keyspaces.inspect}"
+    end
+  end
+
+  def new_client
     ThriftClient.new(CassandraThrift::Cassandra::Client, @servers, @thrift_client_options)
   end
 
   def all_nodes
-    ips = ::JSON.parse(@client.get_string_property('token map')).values
+    ips = ::JSON.parse(new_client.get_string_property('token map')).values
     port = @servers.first.split(':').last
     ips.map{|ip| "#{ip}:#{port}" }
   end
+
 end

data/lib/cassandra/columns.rb

@@ -71,38 +71,36 @@ class Cassandra
           c.value
         end
       end
-      hash    
+      hash
     end
 
-    def hash_to_cfmap(column_family, hash, timestamp)
-      h = Hash.new
-      if is_super(column_family)
-        h[column_family] = hash.collect do |super_column_name, sub_columns|
-          CassandraThrift::ColumnOrSuperColumn.new(
-            :super_column => CassandraThrift::SuperColumn.new(
-              :name => column_name_class(column_family).new(super_column_name).to_s,
-              :columns => sub_columns.collect { |sub_column_name, sub_column_value|
-                CassandraThrift::Column.new(
-                  :name      => sub_column_name_class(column_family).new(sub_column_name).to_s,
-                  :value     => sub_column_value.to_s,
-                  :timestamp => timestamp
-                )
-              }
-            )
+    def _standard_insert_mutation(column_family, column_name, value, timestamp)
+      CassandraThrift::Mutation.new(
+        :column_or_supercolumn => CassandraThrift::ColumnOrSuperColumn.new(
+          :column => CassandraThrift::Column.new(
+            :name      => column_name_class(column_family).new(column_name).to_s,
+            :value     => value,
+            :timestamp => timestamp
           )
-        end
-      else
-        h[column_family] = hash.collect do |column_name, value|
-          CassandraThrift::ColumnOrSuperColumn.new(
-            :column => CassandraThrift::Column.new(
-              :name      => column_name_class(column_family).new(column_name).to_s,
-              :value     => value,
-              :timestamp => timestamp
-            )
+        )
+      )
+    end
+
+    def _super_insert_mutation(column_family, super_column_name, sub_columns, timestamp)
+      CassandraThrift::Mutation.new(:column_or_supercolumn => 
+        CassandraThrift::ColumnOrSuperColumn.new(
+          :super_column => CassandraThrift::SuperColumn.new(
+            :name => column_name_class(column_family).new(super_column_name).to_s,
+            :columns => sub_columns.collect { |sub_column_name, sub_column_value|
+              CassandraThrift::Column.new(
+                :name      => sub_column_name_class(column_family).new(sub_column_name).to_s,
+                :value     => sub_column_value.to_s,
+                :timestamp => timestamp
+              )
+            }
           )
-        end
-      end
-      h
+        )
+      )
     end
   end
 end

data/lib/cassandra/helpers.rb

@@ -19,8 +19,10 @@ class Cassandra
       column, sub_column = args[0], args[1]
       klass, sub_klass = column_name_class(column_family), sub_column_name_class(column_family)
       range_class = column ? sub_klass : klass
-      options[:start] = options[:start] ? range_class.new(options[:start]).to_s : ""
-      options[:finish] = options[:finish] ? range_class.new(options[:finish]).to_s : ""
+
+      [:start, :finish].each do |opt|
+        options[opt] = options[opt] ? range_class.new(options[opt]).to_s : ''
+      end
 
       [column_family, s_map(column, klass), s_map(sub_column, sub_klass), options]
     end
@@ -35,4 +37,4 @@ class Cassandra
       end
     end
   end
-end
+end

data/lib/cassandra/mock.rb

@@ -23,6 +23,9 @@ class Cassandra
       clear_keyspace!
     end
 
+    def disconnect!
+    end
+
     def clear_keyspace!
       @data = {}
     end

data/lib/cassandra/protocol.rb

@@ -4,16 +4,16 @@ class Cassandra
   module Protocol #:nodoc:
     private
 
-    def _insert(key, cfmap, consistency_level)
-      @client.batch_insert(@keyspace, key, cfmap, consistency_level)
+    def _mutate(mutation_map, consistency_level)
+      client.batch_mutate(@keyspace, mutation_map, consistency_level)
     end
 
     def _remove(key, column_path, timestamp, consistency_level)
-      @client.remove(@keyspace, key, column_path, timestamp, consistency_level)
+      client.remove(@keyspace, key, column_path, timestamp, consistency_level)
     end
 
     def _count_columns(column_family, key, super_column, consistency)
-      @client.get_count(@keyspace, key,
+      client.get_count(@keyspace, key,
         CassandraThrift::ColumnParent.new(:column_family => column_family, :super_column => super_column),
         consistency
       )
@@ -22,18 +22,18 @@ class Cassandra
     def _get_columns(column_family, key, columns, sub_columns, consistency)
       result = if is_super(column_family)
         if sub_columns
-          columns_to_hash(column_family, @client.get_slice(@keyspace, key,
+          columns_to_hash(column_family, client.get_slice(@keyspace, key,
             CassandraThrift::ColumnParent.new(:column_family => column_family, :super_column => columns),
             CassandraThrift::SlicePredicate.new(:column_names => sub_columns),
             consistency))
         else
-          columns_to_hash(column_family, @client.get_slice(@keyspace, key,
+          columns_to_hash(column_family, client.get_slice(@keyspace, key,
             CassandraThrift::ColumnParent.new(:column_family => column_family),
             CassandraThrift::SlicePredicate.new(:column_names => columns),
             consistency))
         end
       else
-        columns_to_hash(column_family, @client.get_slice(@keyspace, key,
+        columns_to_hash(column_family, client.get_slice(@keyspace, key,
           CassandraThrift::ColumnParent.new(:column_family => column_family),
           CassandraThrift::SlicePredicate.new(:column_names => columns),
           consistency))
@@ -47,10 +47,10 @@ class Cassandra
       # Single values; count and range parameters have no effect
       if is_super(column_family) and sub_column
         column_path = CassandraThrift::ColumnPath.new(:column_family => column_family, :super_column => column, :column => sub_column)
-        multi_column_to_hash!(@client.multiget(@keyspace, keys, column_path, consistency))
+        multi_column_to_hash!(client.multiget(@keyspace, keys, column_path, consistency))
       elsif !is_super(column_family) and column
         column_path = CassandraThrift::ColumnPath.new(:column_family => column_family, :column => column)
-        multi_column_to_hash!(@client.multiget(@keyspace, keys, column_path, consistency))
+        multi_column_to_hash!(client.multiget(@keyspace, keys, column_path, consistency))
 
       # Slices
       else
@@ -63,16 +63,30 @@ class Cassandra
         
         if is_super(column_family) and column
           column_parent = CassandraThrift::ColumnParent.new(:column_family => column_family, :super_column => column)
-          multi_sub_columns_to_hash!(column_family, @client.multiget_slice(@keyspace, keys, column_parent, predicate, consistency))
+          multi_sub_columns_to_hash!(column_family, client.multiget_slice(@keyspace, keys, column_parent, predicate, consistency))
         else
           column_parent = CassandraThrift::ColumnParent.new(:column_family => column_family)
-          multi_columns_to_hash!(column_family, @client.multiget_slice(@keyspace, keys, column_parent, predicate, consistency))
+          multi_columns_to_hash!(column_family, client.multiget_slice(@keyspace, keys, column_parent, predicate, consistency))
         end
       end
     end
 
     def _get_range(column_family, start, finish, count, consistency)
-      @client.get_key_range(@keyspace, column_family, start, finish, count, consistency)
+      column_parent = CassandraThrift::ColumnParent.new(:column_family => column_family)
+      predicate = CassandraThrift::SlicePredicate.new(:slice_range => CassandraThrift::SliceRange.new(:start => '', :finish => ''))
+      range = CassandraThrift::KeyRange.new(:start_key => start, :end_key => finish)
+      client.get_range_slices(@keyspace, column_parent, predicate, range, 1)
+    end
+    
+    def _get_range_keys(column_family, start, finish, count, consistency)
+      _get_range(column_family, start, finish, count, consistency).collect{|i| i.key }
+    end
+
+    def each_key(column_family)
+      column_parent = CassandraThrift::ColumnParent.new(:column_family => column_family.to_s)
+      predicate = CassandraThrift::SlicePredicate.new(:column_names => [])
+      range = CassandraThrift::KeyRange.new(:start_key => '', :end_key => '')
+      client.get_range_slices(@keyspace, column_parent, predicate, range, 1).each{|i| yield i.key }
     end
   end
 end

data/test/cassandra_client_test.rb

@@ -0,0 +1,20 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+
+class CassandraClientTest < Test::Unit::TestCase
+  include Cassandra::Constants
+  
+  def setup
+    @twitter = Cassandra.new('Twitter', "127.0.0.1:9160", :retries => 2, :exception_classes => [])
+  end
+  
+  def test_client_method_is_called
+    assert_nil @twitter.instance_variable_get(:@client)
+    @twitter.insert(:Statuses, key, {'1' => 'v', '2' => 'v', '3' => 'v'})
+    assert_not_nil @twitter.instance_variable_get(:@client)
+  end
+  
+  def key
+    caller.first[/`(.*?)'/, 1]
+  end
+  
+end

data/test/cassandra_test.rb

@@ -152,14 +152,16 @@ class CassandraTest < Test::Unit::TestCase
     assert_nil @twitter.get(:StatusRelationships, 'bogus', 'user_timelines', columns.keys.first)
   end
 
-  def test_get_range
-    @twitter.insert(:Statuses, '2', {'body' => '1'})
-    @twitter.insert(:Statuses, '3', {'body' => '1'})
-    @twitter.insert(:Statuses, '4', {'body' => '1'})
-    @twitter.insert(:Statuses, '5', {'body' => '1'})
-    @twitter.insert(:Statuses, '6', {'body' => '1'})
-    assert_equal(['3', '4', '5'], @twitter.get_range(:Statuses, :start => '3', :finish => '5'))
-  end
+
+  #TODO: add a OPP keyspace for this
+  # def test_get_range
+  #   @twitter.insert(:Statuses, '2', {'body' => '1'})
+  #   @twitter.insert(:Statuses, '3', {'body' => '1'})
+  #   @twitter.insert(:Statuses, '4', {'body' => '1'})
+  #   @twitter.insert(:Statuses, '5', {'body' => '1'})
+  #   @twitter.insert(:Statuses, '6', {'body' => '1'})
+  #   assert_equal(['3', '4', '5'], @twitter.get_range(:Statuses, :start => '3', :finish => '5'))
+  # end
 
   def test_multi_get
     @twitter.insert(:Users, key + '1', {'body' => 'v1', 'user' => 'v1'})
@@ -182,7 +184,6 @@ class CassandraTest < Test::Unit::TestCase
 
     @twitter.remove(:Statuses, key)
     assert_equal({}, @twitter.get(:Statuses, key))
-    assert_equal 0, @twitter.count_range(:Statuses)
   end
 
   def test_remove_value
@@ -342,6 +343,11 @@ class CassandraTest < Test::Unit::TestCase
     @twitter.insert(:Index, 'asdf', {"thing" => {'jkl' => nil} })
   end
 
+  def test_disconnect!
+    @twitter.disconnect!
+    assert_nil @twitter.instance_variable_get(:@client)
+  end
+
   private
 
   def key

data/vendor/gen-rb/cassandra.rb

@@ -12,6 +12,22 @@ require 'cassandra_types'
         class Client
           include ::Thrift::Client
 
+          def login(keyspace, auth_request)
+            send_login(keyspace, auth_request)
+            recv_login()
+          end
+
+          def send_login(keyspace, auth_request)
+            send_message('login', Login_args, :keyspace => keyspace, :auth_request => auth_request)
+          end
+
+          def recv_login()
+            result = receive_message(Login_result)
+            raise result.authnx unless result.authnx.nil?
+            raise result.authzx unless result.authzx.nil?
+            return
+          end
+
           def get(keyspace, key, column_path, consistency_level)
             send_get(keyspace, key, column_path, consistency_level)
             return recv_get()
@@ -103,40 +119,40 @@ require 'cassandra_types'
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_count failed: unknown result')
           end
 
-          def get_key_range(keyspace, column_family, start, finish, count, consistency_level)
-            send_get_key_range(keyspace, column_family, start, finish, count, consistency_level)
-            return recv_get_key_range()
+          def get_range_slice(keyspace, column_parent, predicate, start_key, finish_key, row_count, consistency_level)
+            send_get_range_slice(keyspace, column_parent, predicate, start_key, finish_key, row_count, consistency_level)
+            return recv_get_range_slice()
           end
 
-          def send_get_key_range(keyspace, column_family, start, finish, count, consistency_level)
-            send_message('get_key_range', Get_key_range_args, :keyspace => keyspace, :column_family => column_family, :start => start, :finish => finish, :count => count, :consistency_level => consistency_level)
+          def send_get_range_slice(keyspace, column_parent, predicate, start_key, finish_key, row_count, consistency_level)
+            send_message('get_range_slice', Get_range_slice_args, :keyspace => keyspace, :column_parent => column_parent, :predicate => predicate, :start_key => start_key, :finish_key => finish_key, :row_count => row_count, :consistency_level => consistency_level)
           end
 
-          def recv_get_key_range()
-            result = receive_message(Get_key_range_result)
+          def recv_get_range_slice()
+            result = receive_message(Get_range_slice_result)
             return result.success unless result.success.nil?
             raise result.ire unless result.ire.nil?
             raise result.ue unless result.ue.nil?
             raise result.te unless result.te.nil?
-            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_key_range failed: unknown result')
+            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_range_slice failed: unknown result')
           end
 
-          def get_range_slice(keyspace, column_parent, predicate, start_key, finish_key, row_count, consistency_level)
-            send_get_range_slice(keyspace, column_parent, predicate, start_key, finish_key, row_count, consistency_level)
-            return recv_get_range_slice()
+          def get_range_slices(keyspace, column_parent, predicate, range, consistency_level)
+            send_get_range_slices(keyspace, column_parent, predicate, range, consistency_level)
+            return recv_get_range_slices()
           end
 
-          def send_get_range_slice(keyspace, column_parent, predicate, start_key, finish_key, row_count, consistency_level)
-            send_message('get_range_slice', Get_range_slice_args, :keyspace => keyspace, :column_parent => column_parent, :predicate => predicate, :start_key => start_key, :finish_key => finish_key, :row_count => row_count, :consistency_level => consistency_level)
+          def send_get_range_slices(keyspace, column_parent, predicate, range, consistency_level)
+            send_message('get_range_slices', Get_range_slices_args, :keyspace => keyspace, :column_parent => column_parent, :predicate => predicate, :range => range, :consistency_level => consistency_level)
           end
 
-          def recv_get_range_slice()
-            result = receive_message(Get_range_slice_result)
+          def recv_get_range_slices()
+            result = receive_message(Get_range_slices_result)
             return result.success unless result.success.nil?
             raise result.ire unless result.ire.nil?
             raise result.ue unless result.ue.nil?
             raise result.te unless result.te.nil?
-            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_range_slice failed: unknown result')
+            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_range_slices failed: unknown result')
           end
 
           def insert(keyspace, key, column_path, value, timestamp, consistency_level)
@@ -190,6 +206,23 @@ require 'cassandra_types'
             return
           end
 
+          def batch_mutate(keyspace, mutation_map, consistency_level)
+            send_batch_mutate(keyspace, mutation_map, consistency_level)
+            recv_batch_mutate()
+          end
+
+          def send_batch_mutate(keyspace, mutation_map, consistency_level)
+            send_message('batch_mutate', Batch_mutate_args, :keyspace => keyspace, :mutation_map => mutation_map, :consistency_level => consistency_level)
+          end
+
+          def recv_batch_mutate()
+            result = receive_message(Batch_mutate_result)
+            raise result.ire unless result.ire.nil?
+            raise result.ue unless result.ue.nil?
+            raise result.te unless result.te.nil?
+            return
+          end
+
           def get_string_property(property)
             send_get_string_property(property)
             return recv_get_string_property()
@@ -220,6 +253,66 @@ require 'cassandra_types'
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_string_list_property failed: unknown result')
           end
 
+          def describe_keyspaces()
+            send_describe_keyspaces()
+            return recv_describe_keyspaces()
+          end
+
+          def send_describe_keyspaces()
+            send_message('describe_keyspaces', Describe_keyspaces_args)
+          end
+
+          def recv_describe_keyspaces()
+            result = receive_message(Describe_keyspaces_result)
+            return result.success unless result.success.nil?
+            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'describe_keyspaces failed: unknown result')
+          end
+
+          def describe_cluster_name()
+            send_describe_cluster_name()
+            return recv_describe_cluster_name()
+          end
+
+          def send_describe_cluster_name()
+            send_message('describe_cluster_name', Describe_cluster_name_args)
+          end
+
+          def recv_describe_cluster_name()
+            result = receive_message(Describe_cluster_name_result)
+            return result.success unless result.success.nil?
+            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'describe_cluster_name failed: unknown result')
+          end
+
+          def describe_version()
+            send_describe_version()
+            return recv_describe_version()
+          end
+
+          def send_describe_version()
+            send_message('describe_version', Describe_version_args)
+          end
+
+          def recv_describe_version()
+            result = receive_message(Describe_version_result)
+            return result.success unless result.success.nil?
+            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'describe_version failed: unknown result')
+          end
+
+          def describe_ring(keyspace)
+            send_describe_ring(keyspace)
+            return recv_describe_ring()
+          end
+
+          def send_describe_ring(keyspace)
+            send_message('describe_ring', Describe_ring_args, :keyspace => keyspace)
+          end
+
+          def recv_describe_ring()
+            result = receive_message(Describe_ring_result)
+            return result.success unless result.success.nil?
+            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'describe_ring failed: unknown result')
+          end
+
           def describe_keyspace(keyspace)
             send_describe_keyspace(keyspace)
             return recv_describe_keyspace()
@@ -236,11 +329,39 @@ require 'cassandra_types'
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'describe_keyspace failed: unknown result')
           end
 
+          def describe_splits(start_token, end_token, keys_per_split)
+            send_describe_splits(start_token, end_token, keys_per_split)
+            return recv_describe_splits()
+          end
+
+          def send_describe_splits(start_token, end_token, keys_per_split)
+            send_message('describe_splits', Describe_splits_args, :start_token => start_token, :end_token => end_token, :keys_per_split => keys_per_split)
+          end
+
+          def recv_describe_splits()
+            result = receive_message(Describe_splits_result)
+            return result.success unless result.success.nil?
+            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'describe_splits failed: unknown result')
+          end
+
         end
 
         class Processor
           include ::Thrift::Processor
 
+          def process_login(seqid, iprot, oprot)
+            args = read_args(iprot, Login_args)
+            result = Login_result.new()
+            begin
+              @handler.login(args.keyspace, args.auth_request)
+            rescue CassandraThrift::AuthenticationException => authnx
+              result.authnx = authnx
+            rescue CassandraThrift::AuthorizationException => authzx
+              result.authzx = authzx
+            end
+            write_result(result, oprot, 'login', seqid)
+          end
+
           def process_get(seqid, iprot, oprot)
             args = read_args(iprot, Get_args)
             result = Get_result.new()
@@ -318,11 +439,11 @@ require 'cassandra_types'
             write_result(result, oprot, 'get_count', seqid)
           end
 
-          def process_get_key_range(seqid, iprot, oprot)
-            args = read_args(iprot, Get_key_range_args)
-            result = Get_key_range_result.new()
+          def process_get_range_slice(seqid, iprot, oprot)
+            args = read_args(iprot, Get_range_slice_args)
+            result = Get_range_slice_result.new()
             begin
-              result.success = @handler.get_key_range(args.keyspace, args.column_family, args.start, args.finish, args.count, args.consistency_level)
+              result.success = @handler.get_range_slice(args.keyspace, args.column_parent, args.predicate, args.start_key, args.finish_key, args.row_count, args.consistency_level)
             rescue CassandraThrift::InvalidRequestException => ire
               result.ire = ire
             rescue CassandraThrift::UnavailableException => ue
@@ -330,14 +451,14 @@ require 'cassandra_types'
             rescue CassandraThrift::TimedOutException => te
               result.te = te
             end
-            write_result(result, oprot, 'get_key_range', seqid)
+            write_result(result, oprot, 'get_range_slice', seqid)
           end
 
-          def process_get_range_slice(seqid, iprot, oprot)
-            args = read_args(iprot, Get_range_slice_args)
-            result = Get_range_slice_result.new()
+          def process_get_range_slices(seqid, iprot, oprot)
+            args = read_args(iprot, Get_range_slices_args)
+            result = Get_range_slices_result.new()
             begin
-              result.success = @handler.get_range_slice(args.keyspace, args.column_parent, args.predicate, args.start_key, args.finish_key, args.row_count, args.consistency_level)
+              result.success = @handler.get_range_slices(args.keyspace, args.column_parent, args.predicate, args.range, args.consistency_level)
             rescue CassandraThrift::InvalidRequestException => ire
               result.ire = ire
             rescue CassandraThrift::UnavailableException => ue
@@ -345,7 +466,7 @@ require 'cassandra_types'
             rescue CassandraThrift::TimedOutException => te
               result.te = te
             end
-            write_result(result, oprot, 'get_range_slice', seqid)
+            write_result(result, oprot, 'get_range_slices', seqid)
           end
 
           def process_insert(seqid, iprot, oprot)
@@ -393,6 +514,21 @@ require 'cassandra_types'
             write_result(result, oprot, 'remove', seqid)
           end
 
+          def process_batch_mutate(seqid, iprot, oprot)
+            args = read_args(iprot, Batch_mutate_args)
+            result = Batch_mutate_result.new()
+            begin
+              @handler.batch_mutate(args.keyspace, args.mutation_map, args.consistency_level)
+            rescue CassandraThrift::InvalidRequestException => ire
+              result.ire = ire
+            rescue CassandraThrift::UnavailableException => ue
+              result.ue = ue
+            rescue CassandraThrift::TimedOutException => te
+              result.te = te
+            end
+            write_result(result, oprot, 'batch_mutate', seqid)
+          end
+
           def process_get_string_property(seqid, iprot, oprot)
             args = read_args(iprot, Get_string_property_args)
             result = Get_string_property_result.new()
@@ -407,6 +543,34 @@ require 'cassandra_types'
             write_result(result, oprot, 'get_string_list_property', seqid)
           end
 
+          def process_describe_keyspaces(seqid, iprot, oprot)
+            args = read_args(iprot, Describe_keyspaces_args)
+            result = Describe_keyspaces_result.new()
+            result.success = @handler.describe_keyspaces()
+            write_result(result, oprot, 'describe_keyspaces', seqid)
+          end
+
+          def process_describe_cluster_name(seqid, iprot, oprot)
+            args = read_args(iprot, Describe_cluster_name_args)
+            result = Describe_cluster_name_result.new()
+            result.success = @handler.describe_cluster_name()
+            write_result(result, oprot, 'describe_cluster_name', seqid)
+          end
+
+          def process_describe_version(seqid, iprot, oprot)
+            args = read_args(iprot, Describe_version_args)
+            result = Describe_version_result.new()
+            result.success = @handler.describe_version()
+            write_result(result, oprot, 'describe_version', seqid)
+          end
+
+          def process_describe_ring(seqid, iprot, oprot)
+            args = read_args(iprot, Describe_ring_args)
+            result = Describe_ring_result.new()
+            result.success = @handler.describe_ring(args.keyspace)
+            write_result(result, oprot, 'describe_ring', seqid)
+          end
+
           def process_describe_keyspace(seqid, iprot, oprot)
             args = read_args(iprot, Describe_keyspace_args)
             result = Describe_keyspace_result.new()
@@ -418,10 +582,55 @@ require 'cassandra_types'
             write_result(result, oprot, 'describe_keyspace', seqid)
           end
 
+          def process_describe_splits(seqid, iprot, oprot)
+            args = read_args(iprot, Describe_splits_args)
+            result = Describe_splits_result.new()
+            result.success = @handler.describe_splits(args.start_token, args.end_token, args.keys_per_split)
+            write_result(result, oprot, 'describe_splits', seqid)
+          end
+
         end
 
         # HELPER FUNCTIONS AND STRUCTURES
 
+        class Login_args
+          include ::Thrift::Struct
+          KEYSPACE = 1
+          AUTH_REQUEST = 2
+
+          ::Thrift::Struct.field_accessor self, :keyspace, :auth_request
+          FIELDS = {
+            KEYSPACE => {:type => ::Thrift::Types::STRING, :name => 'keyspace'},
+            AUTH_REQUEST => {:type => ::Thrift::Types::STRUCT, :name => 'auth_request', :class => CassandraThrift::AuthenticationRequest}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field keyspace is unset!') unless @keyspace
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field auth_request is unset!') unless @auth_request
+          end
+
+        end
+
+        class Login_result
+          include ::Thrift::Struct
+          AUTHNX = 1
+          AUTHZX = 2
+
+          ::Thrift::Struct.field_accessor self, :authnx, :authzx
+          FIELDS = {
+            AUTHNX => {:type => ::Thrift::Types::STRUCT, :name => 'authnx', :class => CassandraThrift::AuthenticationException},
+            AUTHZX => {:type => ::Thrift::Types::STRUCT, :name => 'authzx', :class => CassandraThrift::AuthorizationException}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+        end
+
         class Get_args
           include ::Thrift::Struct
           KEYSPACE = 1
@@ -440,6 +649,10 @@ require 'cassandra_types'
           def struct_fields; FIELDS; end
 
           def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field keyspace is unset!') unless @keyspace
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field key is unset!') unless @key
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field column_path is unset!') unless @column_path
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field consistency_level is unset!') unless @consistency_level
             unless @consistency_level.nil? || CassandraThrift::ConsistencyLevel::VALID_VALUES.include?(@consistency_level)
               raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field consistency_level!')
             end
@@ -491,6 +704,11 @@ require 'cassandra_types'
           def struct_fields; FIELDS; end
 
           def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field keyspace is unset!') unless @keyspace
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field key is unset!') unless @key
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field column_parent is unset!') unless @column_parent
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field predicate is unset!') unless @predicate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field consistency_level is unset!') unless @consistency_level
             unless @consistency_level.nil? || CassandraThrift::ConsistencyLevel::VALID_VALUES.include?(@consistency_level)
               raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field consistency_level!')
             end
@@ -538,6 +756,10 @@ require 'cassandra_types'
           def struct_fields; FIELDS; end
 
           def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field keyspace is unset!') unless @keyspace
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field keys is unset!') unless @keys
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field column_path is unset!') unless @column_path
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field consistency_level is unset!') unless @consistency_level
             unless @consistency_level.nil? || CassandraThrift::ConsistencyLevel::VALID_VALUES.include?(@consistency_level)
               raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field consistency_level!')
             end
@@ -587,6 +809,11 @@ require 'cassandra_types'
           def struct_fields; FIELDS; end
 
           def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field keyspace is unset!') unless @keyspace
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field keys is unset!') unless @keys
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field column_parent is unset!') unless @column_parent
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field predicate is unset!') unless @predicate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field consistency_level is unset!') unless @consistency_level
             unless @consistency_level.nil? || CassandraThrift::ConsistencyLevel::VALID_VALUES.include?(@consistency_level)
               raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field consistency_level!')
             end
@@ -634,6 +861,10 @@ require 'cassandra_types'
           def struct_fields; FIELDS; end
 
           def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field keyspace is unset!') unless @keyspace
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field key is unset!') unless @key
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field column_parent is unset!') unless @column_parent
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field consistency_level is unset!') unless @consistency_level
             unless @consistency_level.nil? || CassandraThrift::ConsistencyLevel::VALID_VALUES.include?(@consistency_level)
               raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field consistency_level!')
             end
@@ -663,28 +894,37 @@ require 'cassandra_types'
 
         end
 
-        class Get_key_range_args
+        class Get_range_slice_args
           include ::Thrift::Struct
           KEYSPACE = 1
-          COLUMN_FAMILY = 2
-          START = 3
-          FINISH = 4
-          COUNT = 5
-          CONSISTENCY_LEVEL = 6
+          COLUMN_PARENT = 2
+          PREDICATE = 3
+          START_KEY = 4
+          FINISH_KEY = 5
+          ROW_COUNT = 6
+          CONSISTENCY_LEVEL = 7
 
-          ::Thrift::Struct.field_accessor self, :keyspace, :column_family, :start, :finish, :count, :consistency_level
+          ::Thrift::Struct.field_accessor self, :keyspace, :column_parent, :predicate, :start_key, :finish_key, :row_count, :consistency_level
           FIELDS = {
             KEYSPACE => {:type => ::Thrift::Types::STRING, :name => 'keyspace'},
-            COLUMN_FAMILY => {:type => ::Thrift::Types::STRING, :name => 'column_family'},
-            START => {:type => ::Thrift::Types::STRING, :name => 'start', :default => %q""},
-            FINISH => {:type => ::Thrift::Types::STRING, :name => 'finish', :default => %q""},
-            COUNT => {:type => ::Thrift::Types::I32, :name => 'count', :default => 100},
+            COLUMN_PARENT => {:type => ::Thrift::Types::STRUCT, :name => 'column_parent', :class => CassandraThrift::ColumnParent},
+            PREDICATE => {:type => ::Thrift::Types::STRUCT, :name => 'predicate', :class => CassandraThrift::SlicePredicate},
+            START_KEY => {:type => ::Thrift::Types::STRING, :name => 'start_key', :default => %q""},
+            FINISH_KEY => {:type => ::Thrift::Types::STRING, :name => 'finish_key', :default => %q""},
+            ROW_COUNT => {:type => ::Thrift::Types::I32, :name => 'row_count', :default => 100},
             CONSISTENCY_LEVEL => {:type => ::Thrift::Types::I32, :name => 'consistency_level', :default =>             1, :enum_class => CassandraThrift::ConsistencyLevel}
           }
 
           def struct_fields; FIELDS; end
 
           def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field keyspace is unset!') unless @keyspace
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field column_parent is unset!') unless @column_parent
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field predicate is unset!') unless @predicate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field start_key is unset!') unless @start_key
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field finish_key is unset!') unless @finish_key
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field row_count is unset!') unless @row_count
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field consistency_level is unset!') unless @consistency_level
             unless @consistency_level.nil? || CassandraThrift::ConsistencyLevel::VALID_VALUES.include?(@consistency_level)
               raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field consistency_level!')
             end
@@ -692,7 +932,7 @@ require 'cassandra_types'
 
         end
 
-        class Get_key_range_result
+        class Get_range_slice_result
           include ::Thrift::Struct
           SUCCESS = 0
           IRE = 1
@@ -701,7 +941,7 @@ require 'cassandra_types'
 
           ::Thrift::Struct.field_accessor self, :success, :ire, :ue, :te
           FIELDS = {
-            SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRING}},
+            SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => CassandraThrift::KeySlice}},
             IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException},
             UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException},
             TE => {:type => ::Thrift::Types::STRUCT, :name => 'te', :class => CassandraThrift::TimedOutException}
@@ -714,30 +954,31 @@ require 'cassandra_types'
 
         end
 
-        class Get_range_slice_args
+        class Get_range_slices_args
           include ::Thrift::Struct
           KEYSPACE = 1
           COLUMN_PARENT = 2
           PREDICATE = 3
-          START_KEY = 4
-          FINISH_KEY = 5
-          ROW_COUNT = 6
-          CONSISTENCY_LEVEL = 7
+          RANGE = 4
+          CONSISTENCY_LEVEL = 5
 
-          ::Thrift::Struct.field_accessor self, :keyspace, :column_parent, :predicate, :start_key, :finish_key, :row_count, :consistency_level
+          ::Thrift::Struct.field_accessor self, :keyspace, :column_parent, :predicate, :range, :consistency_level
           FIELDS = {
             KEYSPACE => {:type => ::Thrift::Types::STRING, :name => 'keyspace'},
             COLUMN_PARENT => {:type => ::Thrift::Types::STRUCT, :name => 'column_parent', :class => CassandraThrift::ColumnParent},
             PREDICATE => {:type => ::Thrift::Types::STRUCT, :name => 'predicate', :class => CassandraThrift::SlicePredicate},
-            START_KEY => {:type => ::Thrift::Types::STRING, :name => 'start_key', :default => %q""},
-            FINISH_KEY => {:type => ::Thrift::Types::STRING, :name => 'finish_key', :default => %q""},
-            ROW_COUNT => {:type => ::Thrift::Types::I32, :name => 'row_count', :default => 100},
+            RANGE => {:type => ::Thrift::Types::STRUCT, :name => 'range', :class => CassandraThrift::KeyRange},
             CONSISTENCY_LEVEL => {:type => ::Thrift::Types::I32, :name => 'consistency_level', :default =>             1, :enum_class => CassandraThrift::ConsistencyLevel}
           }
 
           def struct_fields; FIELDS; end
 
           def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field keyspace is unset!') unless @keyspace
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field column_parent is unset!') unless @column_parent
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field predicate is unset!') unless @predicate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field range is unset!') unless @range
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field consistency_level is unset!') unless @consistency_level
             unless @consistency_level.nil? || CassandraThrift::ConsistencyLevel::VALID_VALUES.include?(@consistency_level)
               raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field consistency_level!')
             end
@@ -745,7 +986,7 @@ require 'cassandra_types'
 
         end
 
-        class Get_range_slice_result
+        class Get_range_slices_result
           include ::Thrift::Struct
           SUCCESS = 0
           IRE = 1
@@ -789,6 +1030,12 @@ require 'cassandra_types'
           def struct_fields; FIELDS; end
 
           def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field keyspace is unset!') unless @keyspace
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field key is unset!') unless @key
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field column_path is unset!') unless @column_path
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field value is unset!') unless @value
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field timestamp is unset!') unless @timestamp
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field consistency_level is unset!') unless @consistency_level
             unless @consistency_level.nil? || CassandraThrift::ConsistencyLevel::VALID_VALUES.include?(@consistency_level)
               raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field consistency_level!')
             end
@@ -834,6 +1081,10 @@ require 'cassandra_types'
           def struct_fields; FIELDS; end
 
           def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field keyspace is unset!') unless @keyspace
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field key is unset!') unless @key
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field cfmap is unset!') unless @cfmap
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field consistency_level is unset!') unless @consistency_level
             unless @consistency_level.nil? || CassandraThrift::ConsistencyLevel::VALID_VALUES.include?(@consistency_level)
               raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field consistency_level!')
             end
@@ -881,6 +1132,10 @@ require 'cassandra_types'
           def struct_fields; FIELDS; end
 
           def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field keyspace is unset!') unless @keyspace
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field key is unset!') unless @key
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field column_path is unset!') unless @column_path
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field timestamp is unset!') unless @timestamp
             unless @consistency_level.nil? || CassandraThrift::ConsistencyLevel::VALID_VALUES.include?(@consistency_level)
               raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field consistency_level!')
             end
@@ -908,6 +1163,52 @@ require 'cassandra_types'
 
         end
 
+        class Batch_mutate_args
+          include ::Thrift::Struct
+          KEYSPACE = 1
+          MUTATION_MAP = 2
+          CONSISTENCY_LEVEL = 3
+
+          ::Thrift::Struct.field_accessor self, :keyspace, :mutation_map, :consistency_level
+          FIELDS = {
+            KEYSPACE => {:type => ::Thrift::Types::STRING, :name => 'keyspace'},
+            MUTATION_MAP => {:type => ::Thrift::Types::MAP, :name => 'mutation_map', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::MAP, :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::LIST, :element => {:type => ::Thrift::Types::STRUCT, :class => CassandraThrift::Mutation}}}},
+            CONSISTENCY_LEVEL => {:type => ::Thrift::Types::I32, :name => 'consistency_level', :default =>             0, :enum_class => CassandraThrift::ConsistencyLevel}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field keyspace is unset!') unless @keyspace
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field mutation_map is unset!') unless @mutation_map
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field consistency_level is unset!') unless @consistency_level
+            unless @consistency_level.nil? || CassandraThrift::ConsistencyLevel::VALID_VALUES.include?(@consistency_level)
+              raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field consistency_level!')
+            end
+          end
+
+        end
+
+        class Batch_mutate_result
+          include ::Thrift::Struct
+          IRE = 1
+          UE = 2
+          TE = 3
+
+          ::Thrift::Struct.field_accessor self, :ire, :ue, :te
+          FIELDS = {
+            IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException},
+            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException},
+            TE => {:type => ::Thrift::Types::STRUCT, :name => 'te', :class => CassandraThrift::TimedOutException}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+        end
+
         class Get_string_property_args
           include ::Thrift::Struct
           PROPERTY = 1
@@ -920,6 +1221,7 @@ require 'cassandra_types'
           def struct_fields; FIELDS; end
 
           def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field property is unset!') unless @property
           end
 
         end
@@ -952,6 +1254,7 @@ require 'cassandra_types'
           def struct_fields; FIELDS; end
 
           def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field property is unset!') unless @property
           end
 
         end
@@ -972,6 +1275,129 @@ require 'cassandra_types'
 
         end
 
+        class Describe_keyspaces_args
+          include ::Thrift::Struct
+
+          FIELDS = {
+
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+        end
+
+        class Describe_keyspaces_result
+          include ::Thrift::Struct
+          SUCCESS = 0
+
+          ::Thrift::Struct.field_accessor self, :success
+          FIELDS = {
+            SUCCESS => {:type => ::Thrift::Types::SET, :name => 'success', :element => {:type => ::Thrift::Types::STRING}}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+        end
+
+        class Describe_cluster_name_args
+          include ::Thrift::Struct
+
+          FIELDS = {
+
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+        end
+
+        class Describe_cluster_name_result
+          include ::Thrift::Struct
+          SUCCESS = 0
+
+          ::Thrift::Struct.field_accessor self, :success
+          FIELDS = {
+            SUCCESS => {:type => ::Thrift::Types::STRING, :name => 'success'}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+        end
+
+        class Describe_version_args
+          include ::Thrift::Struct
+
+          FIELDS = {
+
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+        end
+
+        class Describe_version_result
+          include ::Thrift::Struct
+          SUCCESS = 0
+
+          ::Thrift::Struct.field_accessor self, :success
+          FIELDS = {
+            SUCCESS => {:type => ::Thrift::Types::STRING, :name => 'success'}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+        end
+
+        class Describe_ring_args
+          include ::Thrift::Struct
+          KEYSPACE = 1
+
+          ::Thrift::Struct.field_accessor self, :keyspace
+          FIELDS = {
+            KEYSPACE => {:type => ::Thrift::Types::STRING, :name => 'keyspace'}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field keyspace is unset!') unless @keyspace
+          end
+
+        end
+
+        class Describe_ring_result
+          include ::Thrift::Struct
+          SUCCESS = 0
+
+          ::Thrift::Struct.field_accessor self, :success
+          FIELDS = {
+            SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => CassandraThrift::TokenRange}}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+        end
+
         class Describe_keyspace_args
           include ::Thrift::Struct
           KEYSPACE = 1
@@ -984,6 +1410,7 @@ require 'cassandra_types'
           def struct_fields; FIELDS; end
 
           def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field keyspace is unset!') unless @keyspace
           end
 
         end
@@ -1006,6 +1433,45 @@ require 'cassandra_types'
 
         end
 
+        class Describe_splits_args
+          include ::Thrift::Struct
+          START_TOKEN = 1
+          END_TOKEN = 2
+          KEYS_PER_SPLIT = 3
+
+          ::Thrift::Struct.field_accessor self, :start_token, :end_token, :keys_per_split
+          FIELDS = {
+            START_TOKEN => {:type => ::Thrift::Types::STRING, :name => 'start_token'},
+            END_TOKEN => {:type => ::Thrift::Types::STRING, :name => 'end_token'},
+            KEYS_PER_SPLIT => {:type => ::Thrift::Types::I32, :name => 'keys_per_split'}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field start_token is unset!') unless @start_token
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field end_token is unset!') unless @end_token
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field keys_per_split is unset!') unless @keys_per_split
+          end
+
+        end
+
+        class Describe_splits_result
+          include ::Thrift::Struct
+          SUCCESS = 0
+
+          ::Thrift::Struct.field_accessor self, :success
+          FIELDS = {
+            SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRING}}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+        end
+
       end
 
     end