cassandra 0.4 → 0.5

data/test/comparable_types_test.rb

@@ -1,7 +1,4 @@
-require 'test/unit'
-require "#{File.expand_path(File.dirname(__FILE__))}/../lib/cassandra"
-
-begin; require 'ruby-debug'; rescue LoadError; end
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 class ComparableTypesTest < Test::Unit::TestCase
   include Cassandra::Constants
@@ -26,14 +23,16 @@ class ComparableTypesTest < Test::Unit::TestCase
 
   def test_uuid_sort
     ary = []
-    10.times { ary << UUID.new }
-    assert_equal ary.sort, ary
+    5.times { ary << UUID.new(Time.at(rand(2**31))) }
+    assert_equal ary.map { |_| _.seconds }.sort, ary.sort.map { |_| _.seconds }
+    assert_not_equal ary.sort, ary.sort_by {|_| _.to_guid }
   end
   
   def test_uuid_equality
     uuid = UUID.new
     assert_equal uuid, UUID.new(uuid.to_s)  
     assert_equal uuid, UUID.new(uuid.to_i)  
+    assert_equal uuid, UUID.new(uuid.to_guid)  
   end
   
   def test_uuid_error

data/test/test_helper.rb

@@ -0,0 +1,14 @@
+
+require 'test/unit'
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/cassandra"
+begin; require 'ruby-debug'; rescue LoadError; end
+
+begin
+  @test_client = Cassandra.new('Twitter', '127.0.0.1')
+rescue Thrift::TransportException => e
+  #FIXME Make server automatically start if not running
+  if e.message =~ /Could not connect/
+    puts "*** Please start the Cassandra server by running 'rake cassandra'. ***" 
+    exit 1
+  end
+end

data/vendor/gen-rb/cassandra.rb

@@ -12,30 +12,13 @@ require 'cassandra_types'
         class Client
           include ::Thrift::Client
 
-          def get_slice_by_names(table, key, column_parent, column_names, consistency_level)
-            send_get_slice_by_names(table, key, column_parent, column_names, consistency_level)
-            return recv_get_slice_by_names()
-          end
-
-          def send_get_slice_by_names(table, key, column_parent, column_names, consistency_level)
-            send_message('get_slice_by_names', Get_slice_by_names_args, :table => table, :key => key, :column_parent => column_parent, :column_names => column_names, :consistency_level => consistency_level)
-          end
-
-          def recv_get_slice_by_names()
-            result = receive_message(Get_slice_by_names_result)
-            return result.success unless result.success.nil?
-            raise result.ire unless result.ire.nil?
-            raise result.nfe unless result.nfe.nil?
-            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_slice_by_names failed: unknown result')
-          end
-
-          def get_slice(table, key, column_parent, start, finish, is_ascending, count, consistency_level)
-            send_get_slice(table, key, column_parent, start, finish, is_ascending, count, consistency_level)
+          def get_slice(keyspace, key, column_parent, predicate, consistency_level)          
+            send_get_slice(keyspace, key, column_parent, predicate, consistency_level)
             return recv_get_slice()
           end
 
-          def send_get_slice(table, key, column_parent, start, finish, is_ascending, count, consistency_level)
-            send_message('get_slice', Get_slice_args, :table => table, :key => key, :column_parent => column_parent, :start => start, :finish => finish, :is_ascending => is_ascending, :count => count, :consistency_level => consistency_level)
+          def send_get_slice(keyspace, key, column_parent, predicate, consistency_level)
+            send_message('get_slice', Get_slice_args, :keyspace => keyspace, :key => key, :column_parent => column_parent, :predicate => predicate, :consistency_level => consistency_level)
           end
 
           def recv_get_slice()
@@ -46,46 +29,46 @@ require 'cassandra_types'
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_slice failed: unknown result')
           end
 
-          def get_column(table, key, column_path, consistency_level)
-            send_get_column(table, key, column_path, consistency_level)
-            return recv_get_column()
+          def get(keyspace, key, column_path, consistency_level)
+            send_get(keyspace, key, column_path, consistency_level)
+            return recv_get()
           end
 
-          def send_get_column(table, key, column_path, consistency_level)
-            send_message('get_column', Get_column_args, :table => table, :key => key, :column_path => column_path, :consistency_level => consistency_level)
+          def send_get(keyspace, key, column_path, consistency_level)
+            send_message('get', Get_args, :keyspace => keyspace, :key => key, :column_path => column_path, :consistency_level => consistency_level)
           end
 
-          def recv_get_column()
-            result = receive_message(Get_column_result)
+          def recv_get()
+            result = receive_message(Get_result)
             return result.success unless result.success.nil?
             raise result.ire unless result.ire.nil?
             raise result.nfe unless result.nfe.nil?
-            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_column failed: unknown result')
+            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get failed: unknown result')
           end
 
-          def get_column_count(table, key, column_parent, consistency_level)
-            send_get_column_count(table, key, column_parent, consistency_level)
-            return recv_get_column_count()
+          def get_count(keyspace, key, column_parent, consistency_level)
+            send_get_count(keyspace, key, column_parent, consistency_level)
+            return recv_get_count()
           end
 
-          def send_get_column_count(table, key, column_parent, consistency_level)
-            send_message('get_column_count', Get_column_count_args, :table => table, :key => key, :column_parent => column_parent, :consistency_level => consistency_level)
+          def send_get_count(keyspace, key, column_parent, consistency_level)
+            send_message('get_count', Get_count_args, :keyspace => keyspace, :key => key, :column_parent => column_parent, :consistency_level => consistency_level)
           end
 
-          def recv_get_column_count()
-            result = receive_message(Get_column_count_result)
+          def recv_get_count()
+            result = receive_message(Get_count_result)
             return result.success unless result.success.nil?
             raise result.ire unless result.ire.nil?
-            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_column_count failed: unknown result')
+            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_count failed: unknown result')
           end
 
-          def insert(table, key, column_path, value, timestamp, consistency_level)
-            send_insert(table, key, column_path, value, timestamp, consistency_level)
+          def insert(keyspace, key, column_path, value, timestamp, consistency_level)
+            send_insert(keyspace, key, column_path, value, timestamp, consistency_level)
             recv_insert()
           end
 
-          def send_insert(table, key, column_path, value, timestamp, consistency_level)
-            send_message('insert', Insert_args, :table => table, :key => key, :column_path => column_path, :value => value, :timestamp => timestamp, :consistency_level => consistency_level)
+          def send_insert(keyspace, key, column_path, value, timestamp, consistency_level)
+            send_message('insert', Insert_args, :keyspace => keyspace, :key => key, :column_path => column_path, :value => value, :timestamp => timestamp, :consistency_level => consistency_level)
           end
 
           def recv_insert()
@@ -95,13 +78,13 @@ require 'cassandra_types'
             return
           end
 
-          def batch_insert(table, batch_mutation, consistency_level)
-            send_batch_insert(table, batch_mutation, consistency_level)
+          def batch_insert(keyspace, batch_mutation, consistency_level)
+            send_batch_insert(keyspace, batch_mutation, consistency_level)
             recv_batch_insert()
           end
 
-          def send_batch_insert(table, batch_mutation, consistency_level)
-            send_message('batch_insert', Batch_insert_args, :table => table, :batch_mutation => batch_mutation, :consistency_level => consistency_level)
+          def send_batch_insert(keyspace, batch_mutation, consistency_level)
+            send_message('batch_insert', Batch_insert_args, :keyspace => keyspace, :batch_mutation => batch_mutation, :consistency_level => consistency_level)
           end
 
           def recv_batch_insert()
@@ -111,13 +94,13 @@ require 'cassandra_types'
             return
           end
 
-          def remove(table, key, column_path_or_parent, timestamp, consistency_level)
-            send_remove(table, key, column_path_or_parent, timestamp, consistency_level)
+          def remove(keyspace, key, column_path, timestamp, consistency_level)
+            send_remove(keyspace, key, column_path, timestamp, consistency_level)
             recv_remove()
           end
 
-          def send_remove(table, key, column_path_or_parent, timestamp, consistency_level)
-            send_message('remove', Remove_args, :table => table, :key => key, :column_path_or_parent => column_path_or_parent, :timestamp => timestamp, :consistency_level => consistency_level)
+          def send_remove(keyspace, key, column_path, timestamp, consistency_level)
+            send_message('remove', Remove_args, :keyspace => keyspace, :key => key, :column_path => column_path, :timestamp => timestamp, :consistency_level => consistency_level)
           end
 
           def recv_remove()
@@ -127,62 +110,13 @@ require 'cassandra_types'
             return
           end
 
-          def get_slice_super(table, key, column_family, start, finish, is_ascending, count, consistency_level)
-            send_get_slice_super(table, key, column_family, start, finish, is_ascending, count, consistency_level)
-            return recv_get_slice_super()
-          end
-
-          def send_get_slice_super(table, key, column_family, start, finish, is_ascending, count, consistency_level)
-            send_message('get_slice_super', Get_slice_super_args, :table => table, :key => key, :column_family => column_family, :start => start, :finish => finish, :is_ascending => is_ascending, :count => count, :consistency_level => consistency_level)
-          end
-
-          def recv_get_slice_super()
-            result = receive_message(Get_slice_super_result)
-            return result.success unless result.success.nil?
-            raise result.ire unless result.ire.nil?
-            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_slice_super failed: unknown result')
-          end
-
-          def get_slice_super_by_names(table, key, column_family, super_column_names, consistency_level)
-            send_get_slice_super_by_names(table, key, column_family, super_column_names, consistency_level)
-            return recv_get_slice_super_by_names()
-          end
-
-          def send_get_slice_super_by_names(table, key, column_family, super_column_names, consistency_level)
-            send_message('get_slice_super_by_names', Get_slice_super_by_names_args, :table => table, :key => key, :column_family => column_family, :super_column_names => super_column_names, :consistency_level => consistency_level)
-          end
-
-          def recv_get_slice_super_by_names()
-            result = receive_message(Get_slice_super_by_names_result)
-            return result.success unless result.success.nil?
-            raise result.ire unless result.ire.nil?
-            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_slice_super_by_names failed: unknown result')
-          end
-
-          def get_super_column(table, key, super_column_path, consistency_level)
-            send_get_super_column(table, key, super_column_path, consistency_level)
-            return recv_get_super_column()
-          end
-
-          def send_get_super_column(table, key, super_column_path, consistency_level)
-            send_message('get_super_column', Get_super_column_args, :table => table, :key => key, :super_column_path => super_column_path, :consistency_level => consistency_level)
-          end
-
-          def recv_get_super_column()
-            result = receive_message(Get_super_column_result)
-            return result.success unless result.success.nil?
-            raise result.ire unless result.ire.nil?
-            raise result.nfe unless result.nfe.nil?
-            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_super_column failed: unknown result')
-          end
-
-          def batch_insert_super_column(table, batch_mutation_super, consistency_level)
-            send_batch_insert_super_column(table, batch_mutation_super, consistency_level)
+          def batch_insert_super_column(keyspace, batch_mutation_super, consistency_level)
+            send_batch_insert_super_column(keyspace, batch_mutation_super, consistency_level)
             recv_batch_insert_super_column()
           end
 
-          def send_batch_insert_super_column(table, batch_mutation_super, consistency_level)
-            send_message('batch_insert_super_column', Batch_insert_super_column_args, :table => table, :batch_mutation_super => batch_mutation_super, :consistency_level => consistency_level)
+          def send_batch_insert_super_column(keyspace, batch_mutation_super, consistency_level)
+            send_message('batch_insert_super_column', Batch_insert_super_column_args, :keyspace => keyspace, :batch_mutation_super => batch_mutation_super, :consistency_level => consistency_level)
           end
 
           def recv_batch_insert_super_column()
@@ -192,13 +126,13 @@ require 'cassandra_types'
             return
           end
 
-          def get_key_range(table, column_family, start, finish, count)
-            send_get_key_range(table, column_family, start, finish, count)
+          def get_key_range(keyspace, column_family, start, finish, count)
+            send_get_key_range(keyspace, column_family, start, finish, count)
             return recv_get_key_range()
           end
 
-          def send_get_key_range(table, column_family, start, finish, count)
-            send_message('get_key_range', Get_key_range_args, :table => table, :column_family => column_family, :start => start, :finish => finish, :count => count)
+          def send_get_key_range(keyspace, column_family, start, finish, count)
+            send_message('get_key_range', Get_key_range_args, :keyspace => keyspace, :column_family => column_family, :start => start, :finish => finish, :count => count)
           end
 
           def recv_get_key_range()
@@ -238,20 +172,20 @@ require 'cassandra_types'
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_string_list_property failed: unknown result')
           end
 
-          def describe_table(table)
-            send_describe_table(table)
-            return recv_describe_table()
+          def describe_keyspace(keyspace)
+            send_describe_keyspace(keyspace)
+            return recv_describe_keyspace()
           end
 
-          def send_describe_table(table)
-            send_message('describe_table', Describe_table_args, :table => table)
+          def send_describe_keyspace(keyspace)
+            send_message('describe_keyspace', Describe_keyspace_args, :keyspace => keyspace)
           end
 
-          def recv_describe_table()
-            result = receive_message(Describe_table_result)
+          def recv_describe_keyspace()
+            result = receive_message(Describe_keyspace_result)
             return result.success unless result.success.nil?
             raise result.nfe unless result.nfe.nil?
-            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'describe_table failed: unknown result')
+            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'describe_keyspace failed: unknown result')
           end
 
           def execute_query(query)
@@ -274,24 +208,11 @@ require 'cassandra_types'
         class Processor
           include ::Thrift::Processor
 
-          def process_get_slice_by_names(seqid, iprot, oprot)
-            args = read_args(iprot, Get_slice_by_names_args)
-            result = Get_slice_by_names_result.new()
-            begin
-              result.success = @handler.get_slice_by_names(args.table, args.key, args.column_parent, args.column_names, args.consistency_level)
-            rescue CassandraThrift::InvalidRequestException => ire
-              result.ire = ire
-            rescue CassandraThrift::NotFoundException => nfe
-              result.nfe = nfe
-            end
-            write_result(result, oprot, 'get_slice_by_names', seqid)
-          end
-
           def process_get_slice(seqid, iprot, oprot)
             args = read_args(iprot, Get_slice_args)
             result = Get_slice_result.new()
             begin
-              result.success = @handler.get_slice(args.table, args.key, args.column_parent, args.start, args.finish, args.is_ascending, args.count, args.consistency_level)
+              result.success = @handler.get_slice(args.keyspace, args.key, args.column_parent, args.predicate, args.consistency_level)
             rescue CassandraThrift::InvalidRequestException => ire
               result.ire = ire
             rescue CassandraThrift::NotFoundException => nfe
@@ -300,35 +221,35 @@ require 'cassandra_types'
             write_result(result, oprot, 'get_slice', seqid)
           end
 
-          def process_get_column(seqid, iprot, oprot)
-            args = read_args(iprot, Get_column_args)
-            result = Get_column_result.new()
+          def process_get(seqid, iprot, oprot)
+            args = read_args(iprot, Get_args)
+            result = Get_result.new()
             begin
-              result.success = @handler.get_column(args.table, args.key, args.column_path, args.consistency_level)
+              result.success = @handler.get(args.keyspace, args.key, args.column_path, args.consistency_level)
             rescue CassandraThrift::InvalidRequestException => ire
               result.ire = ire
             rescue CassandraThrift::NotFoundException => nfe
               result.nfe = nfe
             end
-            write_result(result, oprot, 'get_column', seqid)
+            write_result(result, oprot, 'get', seqid)
           end
 
-          def process_get_column_count(seqid, iprot, oprot)
-            args = read_args(iprot, Get_column_count_args)
-            result = Get_column_count_result.new()
+          def process_get_count(seqid, iprot, oprot)
+            args = read_args(iprot, Get_count_args)
+            result = Get_count_result.new()
             begin
-              result.success = @handler.get_column_count(args.table, args.key, args.column_parent, args.consistency_level)
+              result.success = @handler.get_count(args.keyspace, args.key, args.column_parent, args.consistency_level)
             rescue CassandraThrift::InvalidRequestException => ire
               result.ire = ire
             end
-            write_result(result, oprot, 'get_column_count', seqid)
+            write_result(result, oprot, 'get_count', seqid)
           end
 
           def process_insert(seqid, iprot, oprot)
             args = read_args(iprot, Insert_args)
             result = Insert_result.new()
             begin
-              @handler.insert(args.table, args.key, args.column_path, args.value, args.timestamp, args.consistency_level)
+              @handler.insert(args.keyspace, args.key, args.column_path, args.value, args.timestamp, args.consistency_level)
             rescue CassandraThrift::InvalidRequestException => ire
               result.ire = ire
             rescue CassandraThrift::UnavailableException => ue
@@ -341,7 +262,7 @@ require 'cassandra_types'
             args = read_args(iprot, Batch_insert_args)
             result = Batch_insert_result.new()
             begin
-              @handler.batch_insert(args.table, args.batch_mutation, args.consistency_level)
+              @handler.batch_insert(args.keyspace, args.batch_mutation, args.consistency_level)
             rescue CassandraThrift::InvalidRequestException => ire
               result.ire = ire
             rescue CassandraThrift::UnavailableException => ue
@@ -354,7 +275,7 @@ require 'cassandra_types'
             args = read_args(iprot, Remove_args)
             result = Remove_result.new()
             begin
-              @handler.remove(args.table, args.key, args.column_path_or_parent, args.timestamp, args.consistency_level)
+              @handler.remove(args.keyspace, args.key, args.column_path, args.timestamp, args.consistency_level)
             rescue CassandraThrift::InvalidRequestException => ire
               result.ire = ire
             rescue CassandraThrift::UnavailableException => ue
@@ -363,46 +284,11 @@ require 'cassandra_types'
             write_result(result, oprot, 'remove', seqid)
           end
 
-          def process_get_slice_super(seqid, iprot, oprot)
-            args = read_args(iprot, Get_slice_super_args)
-            result = Get_slice_super_result.new()
-            begin
-              result.success = @handler.get_slice_super(args.table, args.key, args.column_family, args.start, args.finish, args.is_ascending, args.count, args.consistency_level)
-            rescue CassandraThrift::InvalidRequestException => ire
-              result.ire = ire
-            end
-            write_result(result, oprot, 'get_slice_super', seqid)
-          end
-
-          def process_get_slice_super_by_names(seqid, iprot, oprot)
-            args = read_args(iprot, Get_slice_super_by_names_args)
-            result = Get_slice_super_by_names_result.new()
-            begin
-              result.success = @handler.get_slice_super_by_names(args.table, args.key, args.column_family, args.super_column_names, args.consistency_level)
-            rescue CassandraThrift::InvalidRequestException => ire
-              result.ire = ire
-            end
-            write_result(result, oprot, 'get_slice_super_by_names', seqid)
-          end
-
-          def process_get_super_column(seqid, iprot, oprot)
-            args = read_args(iprot, Get_super_column_args)
-            result = Get_super_column_result.new()
-            begin
-              result.success = @handler.get_super_column(args.table, args.key, args.super_column_path, args.consistency_level)
-            rescue CassandraThrift::InvalidRequestException => ire
-              result.ire = ire
-            rescue CassandraThrift::NotFoundException => nfe
-              result.nfe = nfe
-            end
-            write_result(result, oprot, 'get_super_column', seqid)
-          end
-
           def process_batch_insert_super_column(seqid, iprot, oprot)
             args = read_args(iprot, Batch_insert_super_column_args)
             result = Batch_insert_super_column_result.new()
             begin
-              @handler.batch_insert_super_column(args.table, args.batch_mutation_super, args.consistency_level)
+              @handler.batch_insert_super_column(args.keyspace, args.batch_mutation_super, args.consistency_level)
             rescue CassandraThrift::InvalidRequestException => ire
               result.ire = ire
             rescue CassandraThrift::UnavailableException => ue
@@ -415,7 +301,7 @@ require 'cassandra_types'
             args = read_args(iprot, Get_key_range_args)
             result = Get_key_range_result.new()
             begin
-              result.success = @handler.get_key_range(args.table, args.column_family, args.start, args.finish, args.count)
+              result.success = @handler.get_key_range(args.keyspace, args.column_family, args.start, args.finish, args.count)
             rescue CassandraThrift::InvalidRequestException => ire
               result.ire = ire
             end
@@ -436,15 +322,15 @@ require 'cassandra_types'
             write_result(result, oprot, 'get_string_list_property', seqid)
           end
 
-          def process_describe_table(seqid, iprot, oprot)
-            args = read_args(iprot, Describe_table_args)
-            result = Describe_table_result.new()
+          def process_describe_keyspace(seqid, iprot, oprot)
+            args = read_args(iprot, Describe_keyspace_args)
+            result = Describe_keyspace_result.new()
             begin
-              result.success = @handler.describe_table(args.table)
+              result.success = @handler.describe_keyspace(args.keyspace)
             rescue CassandraThrift::NotFoundException => nfe
               result.nfe = nfe
             end
-            write_result(result, oprot, 'describe_table', seqid)
+            write_result(result, oprot, 'describe_keyspace', seqid)
           end
 
           def process_execute_query(seqid, iprot, oprot)
@@ -458,73 +344,20 @@ require 'cassandra_types'
 
         # HELPER FUNCTIONS AND STRUCTURES
 
-        class Get_slice_by_names_args
-          include ::Thrift::Struct
-          TABLE = 1
-          KEY = 2
-          COLUMN_PARENT = 3
-          COLUMN_NAMES = 4
-          CONSISTENCY_LEVEL = 5
-
-          ::Thrift::Struct.field_accessor self, :table, :key, :column_parent, :column_names, :consistency_level
-          FIELDS = {
-            TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
-            KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
-            COLUMN_PARENT => {:type => ::Thrift::Types::STRUCT, :name => 'column_parent', :class => CassandraThrift::ColumnParent},
-            COLUMN_NAMES => {:type => ::Thrift::Types::LIST, :name => 'column_names', :element => {:type => ::Thrift::Types::STRING}},
-            CONSISTENCY_LEVEL => {:type => ::Thrift::Types::I32, :name => 'consistency_level', :default =>             1, :enum_class => CassandraThrift::ConsistencyLevel}
-          }
-
-          def struct_fields; FIELDS; end
-
-          def validate
-            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 Get_slice_by_names_result
-          include ::Thrift::Struct
-          SUCCESS = 0
-          IRE = 1
-          NFE = 2
-
-          ::Thrift::Struct.field_accessor self, :success, :ire, :nfe
-          FIELDS = {
-            SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => CassandraThrift::Column}},
-            IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException},
-            NFE => {:type => ::Thrift::Types::STRUCT, :name => 'nfe', :class => CassandraThrift::NotFoundException}
-          }
-
-          def struct_fields; FIELDS; end
-
-          def validate
-          end
-
-        end
-
         class Get_slice_args
           include ::Thrift::Struct
-          TABLE = 1
+          KEYSPACE = 1
           KEY = 2
           COLUMN_PARENT = 3
-          START = 4
-          FINISH = 5
-          IS_ASCENDING = 6
-          COUNT = 7
-          CONSISTENCY_LEVEL = 8
+          PREDICATE = 4
+          CONSISTENCY_LEVEL = 5
 
-          ::Thrift::Struct.field_accessor self, :table, :key, :column_parent, :start, :finish, :is_ascending, :count, :consistency_level
+          ::Thrift::Struct.field_accessor self, :keyspace, :key, :column_parent, :predicate, :consistency_level
           FIELDS = {
-            TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
+            KEYSPACE => {:type => ::Thrift::Types::STRING, :name => 'keyspace'},
             KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
             COLUMN_PARENT => {:type => ::Thrift::Types::STRUCT, :name => 'column_parent', :class => CassandraThrift::ColumnParent},
-            START => {:type => ::Thrift::Types::STRING, :name => 'start'},
-            FINISH => {:type => ::Thrift::Types::STRING, :name => 'finish'},
-            IS_ASCENDING => {:type => ::Thrift::Types::BOOL, :name => 'is_ascending'},
-            COUNT => {:type => ::Thrift::Types::I32, :name => 'count', :default => 100},
+            PREDICATE => {:type => ::Thrift::Types::STRUCT, :name => 'predicate', :class => CassandraThrift::SlicePredicate},
             CONSISTENCY_LEVEL => {:type => ::Thrift::Types::I32, :name => 'consistency_level', :default =>             1, :enum_class => CassandraThrift::ConsistencyLevel}
           }
 
@@ -546,7 +379,7 @@ require 'cassandra_types'
 
           ::Thrift::Struct.field_accessor self, :success, :ire, :nfe
           FIELDS = {
-            SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => CassandraThrift::Column}},
+            SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => CassandraThrift::ColumnOrSuperColumn}},
             IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException},
             NFE => {:type => ::Thrift::Types::STRUCT, :name => 'nfe', :class => CassandraThrift::NotFoundException}
           }
@@ -558,16 +391,16 @@ require 'cassandra_types'
 
         end
 
-        class Get_column_args
+        class Get_args
           include ::Thrift::Struct
-          TABLE = 1
+          KEYSPACE = 1
           KEY = 2
           COLUMN_PATH = 3
           CONSISTENCY_LEVEL = 4
 
-          ::Thrift::Struct.field_accessor self, :table, :key, :column_path, :consistency_level
+          ::Thrift::Struct.field_accessor self, :keyspace, :key, :column_path, :consistency_level
           FIELDS = {
-            TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
+            KEYSPACE => {:type => ::Thrift::Types::STRING, :name => 'keyspace'},
             KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
             COLUMN_PATH => {:type => ::Thrift::Types::STRUCT, :name => 'column_path', :class => CassandraThrift::ColumnPath},
             CONSISTENCY_LEVEL => {:type => ::Thrift::Types::I32, :name => 'consistency_level', :default =>             1, :enum_class => CassandraThrift::ConsistencyLevel}
@@ -583,7 +416,7 @@ require 'cassandra_types'
 
         end
 
-        class Get_column_result
+        class Get_result
           include ::Thrift::Struct
           SUCCESS = 0
           IRE = 1
@@ -591,7 +424,7 @@ require 'cassandra_types'
 
           ::Thrift::Struct.field_accessor self, :success, :ire, :nfe
           FIELDS = {
-            SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => CassandraThrift::Column},
+            SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => CassandraThrift::ColumnOrSuperColumn},
             IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException},
             NFE => {:type => ::Thrift::Types::STRUCT, :name => 'nfe', :class => CassandraThrift::NotFoundException}
           }
@@ -603,16 +436,16 @@ require 'cassandra_types'
 
         end
 
-        class Get_column_count_args
+        class Get_count_args
           include ::Thrift::Struct
-          TABLE = 1
+          KEYSPACE = 1
           KEY = 2
           COLUMN_PARENT = 3
           CONSISTENCY_LEVEL = 5
 
-          ::Thrift::Struct.field_accessor self, :table, :key, :column_parent, :consistency_level
+          ::Thrift::Struct.field_accessor self, :keyspace, :key, :column_parent, :consistency_level
           FIELDS = {
-            TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
+            KEYSPACE => {:type => ::Thrift::Types::STRING, :name => 'keyspace'},
             KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
             COLUMN_PARENT => {:type => ::Thrift::Types::STRUCT, :name => 'column_parent', :class => CassandraThrift::ColumnParent},
             CONSISTENCY_LEVEL => {:type => ::Thrift::Types::I32, :name => 'consistency_level', :default =>             1, :enum_class => CassandraThrift::ConsistencyLevel}
@@ -628,7 +461,7 @@ require 'cassandra_types'
 
         end
 
-        class Get_column_count_result
+        class Get_count_result
           include ::Thrift::Struct
           SUCCESS = 0
           IRE = 1
@@ -648,16 +481,16 @@ require 'cassandra_types'
 
         class Insert_args
           include ::Thrift::Struct
-          TABLE = 1
+          KEYSPACE = 1
           KEY = 2
           COLUMN_PATH = 3
           VALUE = 4
           TIMESTAMP = 5
           CONSISTENCY_LEVEL = 6
 
-          ::Thrift::Struct.field_accessor self, :table, :key, :column_path, :value, :timestamp, :consistency_level
+          ::Thrift::Struct.field_accessor self, :keyspace, :key, :column_path, :value, :timestamp, :consistency_level
           FIELDS = {
-            TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
+            KEYSPACE => {:type => ::Thrift::Types::STRING, :name => 'keyspace'},
             KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
             COLUMN_PATH => {:type => ::Thrift::Types::STRUCT, :name => 'column_path', :class => CassandraThrift::ColumnPath},
             VALUE => {:type => ::Thrift::Types::STRING, :name => 'value'},
@@ -695,13 +528,13 @@ require 'cassandra_types'
 
         class Batch_insert_args
           include ::Thrift::Struct
-          TABLE = 1
+          KEYSPACE = 1
           BATCH_MUTATION = 2
           CONSISTENCY_LEVEL = 3
 
-          ::Thrift::Struct.field_accessor self, :table, :batch_mutation, :consistency_level
+          ::Thrift::Struct.field_accessor self, :keyspace, :batch_mutation, :consistency_level
           FIELDS = {
-            TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
+            KEYSPACE => {:type => ::Thrift::Types::STRING, :name => 'keyspace'},
             BATCH_MUTATION => {:type => ::Thrift::Types::STRUCT, :name => 'batch_mutation', :class => CassandraThrift::BatchMutation},
             CONSISTENCY_LEVEL => {:type => ::Thrift::Types::I32, :name => 'consistency_level', :default =>             0, :enum_class => CassandraThrift::ConsistencyLevel}
           }
@@ -736,17 +569,17 @@ require 'cassandra_types'
 
         class Remove_args
           include ::Thrift::Struct
-          TABLE = 1
+          KEYSPACE = 1
           KEY = 2
-          COLUMN_PATH_OR_PARENT = 3
+          COLUMN_PATH = 3
           TIMESTAMP = 4
           CONSISTENCY_LEVEL = 5
 
-          ::Thrift::Struct.field_accessor self, :table, :key, :column_path_or_parent, :timestamp, :consistency_level
+          ::Thrift::Struct.field_accessor self, :keyspace, :key, :column_path, :timestamp, :consistency_level
           FIELDS = {
-            TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
+            KEYSPACE => {:type => ::Thrift::Types::STRING, :name => 'keyspace'},
             KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
-            COLUMN_PATH_OR_PARENT => {:type => ::Thrift::Types::STRUCT, :name => 'column_path_or_parent', :class => CassandraThrift::ColumnPathOrParent},
+            COLUMN_PATH => {:type => ::Thrift::Types::STRUCT, :name => 'column_path', :class => CassandraThrift::ColumnPath},
             TIMESTAMP => {:type => ::Thrift::Types::I64, :name => 'timestamp'},
             CONSISTENCY_LEVEL => {:type => ::Thrift::Types::I32, :name => 'consistency_level', :default =>             0, :enum_class => CassandraThrift::ConsistencyLevel}
           }
@@ -779,156 +612,15 @@ require 'cassandra_types'
 
         end
 
-        class Get_slice_super_args
-          include ::Thrift::Struct
-          TABLE = 1
-          KEY = 2
-          COLUMN_FAMILY = 3
-          START = 4
-          FINISH = 5
-          IS_ASCENDING = 6
-          COUNT = 7
-          CONSISTENCY_LEVEL = 8
-
-          ::Thrift::Struct.field_accessor self, :table, :key, :column_family, :start, :finish, :is_ascending, :count, :consistency_level
-          FIELDS = {
-            TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
-            KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
-            COLUMN_FAMILY => {:type => ::Thrift::Types::STRING, :name => 'column_family'},
-            START => {:type => ::Thrift::Types::STRING, :name => 'start'},
-            FINISH => {:type => ::Thrift::Types::STRING, :name => 'finish'},
-            IS_ASCENDING => {:type => ::Thrift::Types::BOOL, :name => 'is_ascending'},
-            COUNT => {:type => ::Thrift::Types::I32, :name => '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
-            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 Get_slice_super_result
-          include ::Thrift::Struct
-          SUCCESS = 0
-          IRE = 1
-
-          ::Thrift::Struct.field_accessor self, :success, :ire
-          FIELDS = {
-            SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => CassandraThrift::SuperColumn}},
-            IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException}
-          }
-
-          def struct_fields; FIELDS; end
-
-          def validate
-          end
-
-        end
-
-        class Get_slice_super_by_names_args
-          include ::Thrift::Struct
-          TABLE = 1
-          KEY = 2
-          COLUMN_FAMILY = 3
-          SUPER_COLUMN_NAMES = 4
-          CONSISTENCY_LEVEL = 5
-
-          ::Thrift::Struct.field_accessor self, :table, :key, :column_family, :super_column_names, :consistency_level
-          FIELDS = {
-            TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
-            KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
-            COLUMN_FAMILY => {:type => ::Thrift::Types::STRING, :name => 'column_family'},
-            SUPER_COLUMN_NAMES => {:type => ::Thrift::Types::LIST, :name => 'super_column_names', :element => {:type => ::Thrift::Types::STRING}},
-            CONSISTENCY_LEVEL => {:type => ::Thrift::Types::I32, :name => 'consistency_level', :default =>             1, :enum_class => CassandraThrift::ConsistencyLevel}
-          }
-
-          def struct_fields; FIELDS; end
-
-          def validate
-            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 Get_slice_super_by_names_result
-          include ::Thrift::Struct
-          SUCCESS = 0
-          IRE = 1
-
-          ::Thrift::Struct.field_accessor self, :success, :ire
-          FIELDS = {
-            SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => CassandraThrift::SuperColumn}},
-            IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException}
-          }
-
-          def struct_fields; FIELDS; end
-
-          def validate
-          end
-
-        end
-
-        class Get_super_column_args
-          include ::Thrift::Struct
-          TABLE = 1
-          KEY = 2
-          SUPER_COLUMN_PATH = 3
-          CONSISTENCY_LEVEL = 4
-
-          ::Thrift::Struct.field_accessor self, :table, :key, :super_column_path, :consistency_level
-          FIELDS = {
-            TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
-            KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
-            SUPER_COLUMN_PATH => {:type => ::Thrift::Types::STRUCT, :name => 'super_column_path', :class => CassandraThrift::SuperColumnPath},
-            CONSISTENCY_LEVEL => {:type => ::Thrift::Types::I32, :name => 'consistency_level', :default =>             1, :enum_class => CassandraThrift::ConsistencyLevel}
-          }
-
-          def struct_fields; FIELDS; end
-
-          def validate
-            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 Get_super_column_result
-          include ::Thrift::Struct
-          SUCCESS = 0
-          IRE = 1
-          NFE = 2
-
-          ::Thrift::Struct.field_accessor self, :success, :ire, :nfe
-          FIELDS = {
-            SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => CassandraThrift::SuperColumn},
-            IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException},
-            NFE => {:type => ::Thrift::Types::STRUCT, :name => 'nfe', :class => CassandraThrift::NotFoundException}
-          }
-
-          def struct_fields; FIELDS; end
-
-          def validate
-          end
-
-        end
-
         class Batch_insert_super_column_args
           include ::Thrift::Struct
-          TABLE = 1
+          KEYSPACE = 1
           BATCH_MUTATION_SUPER = 2
           CONSISTENCY_LEVEL = 3
 
-          ::Thrift::Struct.field_accessor self, :table, :batch_mutation_super, :consistency_level
+          ::Thrift::Struct.field_accessor self, :keyspace, :batch_mutation_super, :consistency_level
           FIELDS = {
-            TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
+            KEYSPACE => {:type => ::Thrift::Types::STRING, :name => 'keyspace'},
             BATCH_MUTATION_SUPER => {:type => ::Thrift::Types::STRUCT, :name => 'batch_mutation_super', :class => CassandraThrift::BatchMutationSuper},
             CONSISTENCY_LEVEL => {:type => ::Thrift::Types::I32, :name => 'consistency_level', :default =>             0, :enum_class => CassandraThrift::ConsistencyLevel}
           }
@@ -963,15 +655,15 @@ require 'cassandra_types'
 
         class Get_key_range_args
           include ::Thrift::Struct
-          TABLE = 1
+          KEYSPACE = 1
           COLUMN_FAMILY = 2
           START = 3
           FINISH = 4
           COUNT = 5
 
-          ::Thrift::Struct.field_accessor self, :table, :column_family, :start, :finish, :count
+          ::Thrift::Struct.field_accessor self, :keyspace, :column_family, :start, :finish, :count
           FIELDS = {
-            TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
+            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""},
@@ -1067,13 +759,13 @@ require 'cassandra_types'
 
         end
 
-        class Describe_table_args
+        class Describe_keyspace_args
           include ::Thrift::Struct
-          TABLE = 1
+          KEYSPACE = 1
 
-          ::Thrift::Struct.field_accessor self, :table
+          ::Thrift::Struct.field_accessor self, :keyspace
           FIELDS = {
-            TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'}
+            KEYSPACE => {:type => ::Thrift::Types::STRING, :name => 'keyspace'}
           }
 
           def struct_fields; FIELDS; end
@@ -1083,7 +775,7 @@ require 'cassandra_types'
 
         end
 
-        class Describe_table_result
+        class Describe_keyspace_result
           include ::Thrift::Struct
           SUCCESS = 0
           NFE = 1