cassandra_client 0.2.2 → 0.3

data.tar.gz.sig

@@ -1,2 +1 @@
-"-a�����cR��W�9�uKKJ���%�l��6ى0�H��^�#jݸRu�Y%�XFro߰>|�5��~4�`��䖘�����O�e�)�D$�*�Uz1GG��dzg����-J�}-�$Y�u1�b���U��1�ؤ,"�#�3AG�T���Y��?=���Ii�e?��ȅs�hi�qy���BjDG���7���LȘ�uMw L5)��T�T3ڹ-
-�:q�o
+|��{Py3���5��dB�w������c���fe`�.k��)��5V���ˀ$�avzD�����|1��^`+�9Nj��!�P�!Z68b�w�9Ps��ls�vEjr�ΓV7��Qn�v�8E1�U��md�Yܕ|9��

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v0.3. Use new Thrift API.
+
 v0.2.2. Use nil for empty byte array, not empty string. Improves API.
 
 v0.2.1. Don't write serialization overhead on nulls.

data/README

@@ -19,7 +19,7 @@ The public certificate for this gem is here[http://rubyforge.org/frs/download.ph
 
 This is an alpha release and does not yet support the full Thrift API. 
 
-Cassandra is a rapidly moving target; this library is currently tested against {Cassandra trunk revision 789419}[http://blog.evanweaver.com/files/cassandra/cassandra-r789419.tar.bz2]. 
+Cassandra is a rapidly moving target, but this library should always run against the bundle available {here}[http://github.com/fauna/cassandra_client/raw/6546d1155b77ca7bc5ebf58bdcce79ddda36f611/vendor/cassandra.tar.bz2]. Don't expect it to work against any other version right now.
 
 The Github source repository is {here}[http://github.com/fauna/cassandra_client/]; patches and contributions are very welcome.
 

data/cassandra_client.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra_client}
-  s.version = "0.2.2"
+  s.version = "0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
   s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
-  s.date = %q{2009-07-06}
+  s.date = %q{2009-07-16}
   s.description = %q{A Ruby client for CassandraDB.}
   s.email = %q{}
   s.extra_rdoc_files = ["CHANGELOG", "lib/cassandra_client/cassandra_client.rb", "lib/cassandra_client/helper.rb", "lib/cassandra_client/ordered_hash.rb", "lib/cassandra_client/safe_client.rb", "lib/cassandra_client/serialization.rb", "lib/cassandra_client.rb", "LICENSE", "README", "vendor/gen-rb/cassandra_constants.rb", "vendor/gen-rb/cassandra_types.rb"]

data/conf/cassandra.in.sh

@@ -15,10 +15,10 @@
 # limitations under the License.
 
 
-cassandra_home=`dirname $0`/..
+cassandra_home=`pwd`/cassandra
 
 # The directory where Cassandra's configs live (required)
-CASSANDRA_CONF=$cassandra_home/../conf
+CASSANDRA_CONF=`pwd`/conf
 
 # This can be the path to a jar file, or a directory containing the 
 # compiled classes. NOTE: This isn't needed by the startup script,
@@ -33,6 +33,8 @@ for jar in $cassandra_home/lib/*.jar; do
     CLASSPATH=$CLASSPATH:$jar
 done
 
+echo $cassandra_home
+
 # Arguments to pass to the JVM
 JVM_OPTS=" \
         -ea \

data/conf/storage-conf.xml

@@ -30,16 +30,18 @@
     -->
     <Tables>
       <Table Name="Twitter">
+          <KeysCachedFraction>0.01</KeysCachedFraction>
           <ColumnFamily ColumnSort="Name" Name="Users" />
           <ColumnFamily ColumnSort="Name" Name="UserAudits" />
-          <ColumnFamily ColumnType="Super" ColumnSort="Name" Name="UserRelationships" />
+          <ColumnFamily ColumnType="Super" Name="UserRelationships" />
           <ColumnFamily ColumnSort="Time" Name="Usernames" />
           <ColumnFamily ColumnSort="Time" Name="Statuses" />
           <ColumnFamily ColumnSort="Name" Name="StatusAudits" />
-          <ColumnFamily ColumnType="Super" ColumnSort="Name" Name="StatusRelationships" />  
+          <ColumnFamily ColumnType="Super" Name="StatusRelationships" />  
       </Table>
 
       <Table Name="Multiblog">      
+        <KeysCachedFraction>0.01</KeysCachedFraction>
         <ColumnFamily ColumnSort="Time" Name="Blogs"/>
         <ColumnFamily ColumnSort="Time" Name="Comments"/>
       </Table>

data/lib/cassandra_client/cassandra_client.rb

@@ -39,27 +39,17 @@ class CassandraClient
   # Insert a row for a key. Pass a flat hash for a regular column family, and 
   # a nested hash for a super column family.
   def insert(column_family, key, hash, timestamp = now)
-    column_family = column_family.to_s    
-    insert = is_super(column_family) ? :insert_super : :insert_standard
-    send(insert, column_family, key, hash, timestamp)
-  end
-  
-  private
-
-  def insert_standard(column_family, key, hash, timestamp = now)
-    mutation = Batch_mutation_t.new(
-      :table => @keyspace, 
-      :key => key, 
-      :cfmap => {column_family => hash_to_columns(hash, timestamp)})
-    @client.batch_insert(mutation, @quorum)
-  end 
-
-  def insert_super(column_family, key, hash, timestamp = now)
-    mutation = Batch_mutation_super_t.new(
-      :table => @keyspace, 
-      :key => key, 
-      :cfmap => {column_family => hash_to_super_columns(hash, timestamp)})
-    @client.batch_insert_superColumn(mutation, @quorum)
+    if is_super(column_family) 
+      mutation = BatchMutationSuper.new(
+        :key => key, 
+        :cfmap => {column_family.to_s => hash_to_super_columns(hash, timestamp)})
+      @client.batch_insert_super_column(@keyspace, mutation, @quorum)    
+    else
+      mutation = BatchMutation.new(
+        :key => key, 
+        :cfmap => {column_family.to_s => hash_to_columns(hash, timestamp)})
+      @client.batch_insert(@keyspace, mutation, @quorum)
+    end
   end 
   
   public
@@ -69,10 +59,10 @@ class CassandraClient
   # Remove the element at the column_family:key:super_column:column 
   # path you request.
   def remove(column_family, key, super_column = nil, column = nil, timestamp = now)
-    column_family = column_family.to_s
-    column_family += ":#{super_column}" if super_column
-    column_family += ":#{column}" if column
-    @client.remove(@keyspace, key, column_family, timestamp, @quorum)
+    super_column, column = column, super_column unless is_super(column_family)
+    @client.remove(@keyspace, key,
+      ColumnPathOrParent.new(:column_family => column_family.to_s, :super_column => super_column, :column => column), 
+      timestamp, @quorum)
   end
   
   # Remove all rows in the column family you request.
@@ -94,59 +84,53 @@ class CassandraClient
   # Count the elements at the column_family:key:super_column path you 
   # request.
   def count_columns(column_family, key, super_column = nil)
-    column_family = column_family.to_s
-    column_family += ":#{super_column}" if super_column
-    @client.get_column_count(@keyspace, key, column_family)
+    @client.get_column_count(@keyspace, key, 
+      ColumnParent.new(:column_family => column_family.to_s, :super_column => super_column)
+    )
   end
   
   # Return a list of single values for the elements at the
   # column_family:key:super_column:column path you request.
   def get_columns(column_family, key, super_columns, columns = nil)
-    column_family = column_family.to_s
-    get_slice_by_names = (is_super(column_family) && !columns) ? :get_slice_super_by_names : :get_slice_by_names
-    if super_columns and columns
-      column_family += ":#{super_columns}" 
-      columns = Array(columns)
+    super_columns, columns = columns, super_columns unless columns
+    result = if is_super(column_family) && !super_columns 
+      columns_to_hash(@client.get_slice_super_by_names(@keyspace, key, column_family.to_s, columns))
     else
-      columns = Array(super_columns)
-    end
-        
-    hash = columns_to_hash(@client.send(get_slice_by_names, @keyspace, key, column_family, columns))
-    columns.map { |column| hash[column] }
+      columns_to_hash(@client.get_slice_by_names(@keyspace, key, 
+        ColumnParent.new(:column_family => column_family.to_s, :super_column => super_columns), columns))
+    end    
+    columns.map { |name| result[name] }
   end
         
   # Return a hash (actually, a CassandraClient::OrderedHash) or a single value 
   # representing the element at the column_family:key:super_column:column 
   # path you request.
-  def get(column_family, key, super_column = nil, column = nil, offset = -1, limit = 100)
-    column_family = column_family.to_s
-    column_family += ":#{super_column}" if super_column
-    column_family += ":#{column}" if column          
-    
+  def get(column_family, key, super_column = nil, column = nil, limit = 100)
     # You have got to be kidding
     if is_super(column_family)
       if column
-        load(@client.get_column(@keyspace, key, column_family).value)
+        load(@client.get_column(@keyspace, key,  ColumnPath.new(:column_family => column_family.to_s, :super_column => super_column, :column => column)).value)
       elsif super_column
-        columns_to_hash(@client.get_superColumn(@keyspace, key, column_family).columns)
+        columns_to_hash(@client.get_super_column(@keyspace, key,  SuperColumnPath.new(:column_family => column_family.to_s, :super_column => super_column)).columns)
       else
-        columns_to_hash(@client.get_slice_super(@keyspace, key, "#{column_family}:", offset, limit))
+        # FIXME bug
+        columns_to_hash(@client.get_slice_super(@keyspace, key, column_family.to_s, '', '', -1, limit))
       end
     else
       if super_column
-        load(@client.get_column(@keyspace, key, column_family).value)
+        load(@client.get_column(@keyspace, key, ColumnPath.new(:column_family => column_family.to_s, :column => super_column)).value)
       elsif is_sorted_by_time(column_family)
-        result = columns_to_hash(@client.get_columns_since(@keyspace, key, column_family, 0))
+        result = columns_to_hash(@client.get_columns_since(@keyspace, key, ColumnParent.new(:column_family => column_family.to_s), 0))
 
         # FIXME Hack until get_slice on a time-sorted column family works again
-        result = OrderedHash[*flatten_once(result.to_a[offset, limit])] if offset > -1
+        result = OrderedHash[*flatten_once(result.to_a[0, limit])]
         result
       else
-        columns_to_hash(@client.get_slice(@keyspace, key, "#{column_family}:", offset, limit))
+        columns_to_hash(@client.get_slice(@keyspace, key, ColumnParent.new(:column_family => column_family.to_s), '', '', -1, limit))
       end 
     end
   rescue NotFoundException
-    is_super(column_family) && !column ? {} : nil
+    is_super(column_family) && !column ? OrderedHash.new : nil
   end
   
   # FIXME
@@ -160,8 +144,7 @@ class CassandraClient
   # Return a list of keys in the column_family you request. Requires the
   # table to be partitioned with OrderPreservingHash.
   def get_key_range(column_family, key_range = ''..'', limit = 100)      
-    column_families = Array(column_family).map {|c| c.to_s}
-    @client.get_key_range(@keyspace, column_families, key_range.begin, key_range.end, limit)
+    @client.get_key_range(@keyspace, column_family.to_s, key_range.begin, key_range.end, limit)
   end
   
   # Count all rows in the column_family you request. Requires the table 

data/lib/cassandra_client/helper.rb

@@ -4,11 +4,11 @@ class CassandraClient
     private
     
     def is_super(column_family)
-      column_family_property(column_family, 'type') == 'Super'
+      column_family_property(column_family.to_s, 'type') == 'Super'
     end
 
     def is_sorted_by_time(column_family)
-      column_family_property(column_family, 'sort') == 'Time'
+      column_family_property(column_family.to_s, 'sort') == 'Time'
     end
     
     def column_family_property(column_family_or_path, key)
@@ -21,10 +21,10 @@ class CassandraClient
     def columns_to_hash(columns)
       hash = ::CassandraClient::OrderedHash.new
       Array(columns).each do |c| 
-        if c.is_a?(SuperColumn_t)
-          hash[c.name] = columns_to_hash(c.columns)
+        hash[c.name] = if c.is_a?(SuperColumn)
+          columns_to_hash(c.columns)
         else
-          hash[c.columnName] = load(c.value)
+          load(c.value)
         end
       end
       hash
@@ -32,13 +32,13 @@ class CassandraClient
     
     def hash_to_columns(hash, timestamp)
       hash.map do |column, value|
-        Column_t.new(:columnName => column, :value => dump(value), :timestamp => timestamp)
+        Column.new(:name => column, :value => dump(value), :timestamp => timestamp)
       end    
     end
     
     def hash_to_super_columns(hash, timestamp)
       hash.map do |super_column, columns|
-        SuperColumn_t.new(:name => super_column, :columns => hash_to_columns(columns, timestamp))
+        SuperColumn.new(:name => super_column, :columns => hash_to_columns(columns, timestamp))
       end
     end
     

data/quickstart.sh

@@ -1,10 +1,12 @@
 
-if [ ! -e cassandra-r789419 ]; then
+if [ ! -e cassandra ]; then
+  rm -rf data
   cd vendor
-  tar xjvf cassandra-r789419.tar.bz2
-  mv cassandra-r789419 ..
+  tar xjf cassandra.tar.bz2
+  mv cassandra ..
+  cd ../cassandra
+  ant
   cd ..
 fi
 
-export CASSANDRA_INCLUDE=`pwd`/conf/cassandra.in.sh
-cassandra-r789419/bin/cassandra -f
+env CASSANDRA_INCLUDE=`pwd`/conf/cassandra.in.sh cassandra/bin/cassandra -f

data/test/cassandra_client_test.rb

@@ -58,7 +58,7 @@ class CassandraClientTest < Test::Unit::TestCase
   def test_get_key_time_sorted_with_limit
     @twitter.insert(:Statuses, key, {'first' => 'v'})
     @twitter.insert(:Statuses, key, {'second' => 'v'})
-    assert_equal({'second' => 'v'}, @twitter.get(:Statuses, key, nil, nil, 0, 1))
+    assert_equal({'second' => 'v'}, @twitter.get(:Statuses, key, nil, nil, 1))
   end    
 
   def test_get_value
@@ -116,8 +116,11 @@ class CassandraClientTest < Test::Unit::TestCase
   
   def test_remove_key
     @twitter.insert(:Statuses, key, {'body' => 'v'})
+    assert_equal({'body' => 'v'}, @twitter.get(:Statuses, key))
+
     @twitter.remove(:Statuses, key)
     assert_equal({}, @twitter.get(:Statuses, key))
+    assert_equal 0, @twitter.count(:Statuses)  
   end
 
   def test_remove_value
@@ -143,6 +146,14 @@ class CassandraClientTest < Test::Unit::TestCase
     @twitter.remove(:StatusRelationships, key, 'user_timelines', '1')
     assert_nil @twitter.get(:StatusRelationships, key, 'user_timelines', '1')    
   end
+  
+  def test_clear_column_family
+    @twitter.insert(:Statuses, key + "1", {'body' => '1'})
+    @twitter.insert(:Statuses, key + "2", {'body' => '2'})
+    @twitter.insert(:Statuses, key + "3", {'body' => '3'})
+    @twitter.clear_column_family!(:Statuses)
+    assert_equal 0, @twitter.count(:Statuses)  
+  end  
 
   def test_insert_key
     @twitter.insert(:Statuses, key, {'body' => 'v', 'user' => 'v'})
@@ -156,7 +167,7 @@ class CassandraClientTest < Test::Unit::TestCase
   
   def test_get_column_values
     @twitter.insert(:Statuses, key, {'body' => 'v1', 'user' => 'v2'})
-    assert_equal(['v1' , 'v2'], @twitter.get_columns(:Statuses, key,['body', 'user']))
+    assert_equal(['v1' , 'v2'], @twitter.get_columns(:Statuses, key, ['body', 'user']))
   end  
 
   def test_get_column_values_super

data/vendor/gen-rb/cassandra.rb

@@ -11,30 +11,13 @@ module Cassandra
   class Client
     include ::Thrift::Client
 
-    def get_slice_by_name_range(tablename, key, columnParent, start, finish, count)
-      send_get_slice_by_name_range(tablename, key, columnParent, start, finish, count)
-      return recv_get_slice_by_name_range()
-    end
-
-    def send_get_slice_by_name_range(tablename, key, columnParent, start, finish, count)
-      send_message('get_slice_by_name_range', Get_slice_by_name_range_args, :tablename => tablename, :key => key, :columnParent => columnParent, :start => start, :finish => finish, :count => count)
-    end
-
-    def recv_get_slice_by_name_range()
-      result = receive_message(Get_slice_by_name_range_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_name_range failed: unknown result')
-    end
-
-    def get_slice_by_names(tablename, key, columnParent, columnNames)
-      send_get_slice_by_names(tablename, key, columnParent, columnNames)
+    def get_slice_by_names(table, key, column_parent, column_names)
+      send_get_slice_by_names(table, key, column_parent, column_names)
       return recv_get_slice_by_names()
     end
 
-    def send_get_slice_by_names(tablename, key, columnParent, columnNames)
-      send_message('get_slice_by_names', Get_slice_by_names_args, :tablename => tablename, :key => key, :columnParent => columnParent, :columnNames => columnNames)
+    def send_get_slice_by_names(table, key, column_parent, column_names)
+      send_message('get_slice_by_names', Get_slice_by_names_args, :table => table, :key => key, :column_parent => column_parent, :column_names => column_names)
     end
 
     def recv_get_slice_by_names()
@@ -45,13 +28,13 @@ module Cassandra
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_slice_by_names failed: unknown result')
     end
 
-    def get_slice(tablename, key, columnParent, isAscending, count)
-      send_get_slice(tablename, key, columnParent, isAscending, count)
+    def get_slice(table, key, column_parent, start, finish, is_ascending, count)
+      send_get_slice(table, key, column_parent, start, finish, is_ascending, count)
       return recv_get_slice()
     end
 
-    def send_get_slice(tablename, key, columnParent, isAscending, count)
-      send_message('get_slice', Get_slice_args, :tablename => tablename, :key => key, :columnParent => columnParent, :isAscending => isAscending, :count => count)
+    def send_get_slice(table, key, column_parent, start, finish, is_ascending, count)
+      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)
     end
 
     def recv_get_slice()
@@ -62,13 +45,13 @@ module Cassandra
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_slice failed: unknown result')
     end
 
-    def get_column(tablename, key, columnPath)
-      send_get_column(tablename, key, columnPath)
+    def get_column(table, key, column_path)
+      send_get_column(table, key, column_path)
       return recv_get_column()
     end
 
-    def send_get_column(tablename, key, columnPath)
-      send_message('get_column', Get_column_args, :tablename => tablename, :key => key, :columnPath => columnPath)
+    def send_get_column(table, key, column_path)
+      send_message('get_column', Get_column_args, :table => table, :key => key, :column_path => column_path)
     end
 
     def recv_get_column()
@@ -79,13 +62,13 @@ module Cassandra
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_column failed: unknown result')
     end
 
-    def get_column_count(tablename, key, columnParent)
-      send_get_column_count(tablename, key, columnParent)
+    def get_column_count(table, key, column_parent)
+      send_get_column_count(table, key, column_parent)
       return recv_get_column_count()
     end
 
-    def send_get_column_count(tablename, key, columnParent)
-      send_message('get_column_count', Get_column_count_args, :tablename => tablename, :key => key, :columnParent => columnParent)
+    def send_get_column_count(table, key, column_parent)
+      send_message('get_column_count', Get_column_count_args, :table => table, :key => key, :column_parent => column_parent)
     end
 
     def recv_get_column_count()
@@ -95,13 +78,13 @@ module Cassandra
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_column_count failed: unknown result')
     end
 
-    def insert(tablename, key, columnPath, cellData, timestamp, block_for)
-      send_insert(tablename, key, columnPath, cellData, timestamp, block_for)
+    def insert(table, key, column_path, value, timestamp, block_for)
+      send_insert(table, key, column_path, value, timestamp, block_for)
       recv_insert()
     end
 
-    def send_insert(tablename, key, columnPath, cellData, timestamp, block_for)
-      send_message('insert', Insert_args, :tablename => tablename, :key => key, :columnPath => columnPath, :cellData => cellData, :timestamp => timestamp, :block_for => block_for)
+    def send_insert(table, key, column_path, value, timestamp, block_for)
+      send_message('insert', Insert_args, :table => table, :key => key, :column_path => column_path, :value => value, :timestamp => timestamp, :block_for => block_for)
     end
 
     def recv_insert()
@@ -111,13 +94,13 @@ module Cassandra
       return
     end
 
-    def batch_insert(batchMutation, block_for)
-      send_batch_insert(batchMutation, block_for)
+    def batch_insert(table, batch_mutation, block_for)
+      send_batch_insert(table, batch_mutation, block_for)
       recv_batch_insert()
     end
 
-    def send_batch_insert(batchMutation, block_for)
-      send_message('batch_insert', Batch_insert_args, :batchMutation => batchMutation, :block_for => block_for)
+    def send_batch_insert(table, batch_mutation, block_for)
+      send_message('batch_insert', Batch_insert_args, :table => table, :batch_mutation => batch_mutation, :block_for => block_for)
     end
 
     def recv_batch_insert()
@@ -127,13 +110,13 @@ module Cassandra
       return
     end
 
-    def remove(tablename, key, columnPathOrParent, timestamp, block_for)
-      send_remove(tablename, key, columnPathOrParent, timestamp, block_for)
+    def remove(table, key, column_path_or_parent, timestamp, block_for)
+      send_remove(table, key, column_path_or_parent, timestamp, block_for)
       recv_remove()
     end
 
-    def send_remove(tablename, key, columnPathOrParent, timestamp, block_for)
-      send_message('remove', Remove_args, :tablename => tablename, :key => key, :columnPathOrParent => columnPathOrParent, :timestamp => timestamp, :block_for => block_for)
+    def send_remove(table, key, column_path_or_parent, timestamp, block_for)
+      send_message('remove', Remove_args, :table => table, :key => key, :column_path_or_parent => column_path_or_parent, :timestamp => timestamp, :block_for => block_for)
     end
 
     def recv_remove()
@@ -143,13 +126,13 @@ module Cassandra
       return
     end
 
-    def get_columns_since(tablename, key, columnParent, timeStamp)
-      send_get_columns_since(tablename, key, columnParent, timeStamp)
+    def get_columns_since(table, key, column_parent, timeStamp)
+      send_get_columns_since(table, key, column_parent, timeStamp)
       return recv_get_columns_since()
     end
 
-    def send_get_columns_since(tablename, key, columnParent, timeStamp)
-      send_message('get_columns_since', Get_columns_since_args, :tablename => tablename, :key => key, :columnParent => columnParent, :timeStamp => timeStamp)
+    def send_get_columns_since(table, key, column_parent, timeStamp)
+      send_message('get_columns_since', Get_columns_since_args, :table => table, :key => key, :column_parent => column_parent, :timeStamp => timeStamp)
     end
 
     def recv_get_columns_since()
@@ -160,13 +143,13 @@ module Cassandra
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_columns_since failed: unknown result')
     end
 
-    def get_slice_super(tablename, key, columnFamily, isAscending, count)
-      send_get_slice_super(tablename, key, columnFamily, isAscending, count)
+    def get_slice_super(table, key, column_family, start, finish, is_ascending, count)
+      send_get_slice_super(table, key, column_family, start, finish, is_ascending, count)
       return recv_get_slice_super()
     end
 
-    def send_get_slice_super(tablename, key, columnFamily, isAscending, count)
-      send_message('get_slice_super', Get_slice_super_args, :tablename => tablename, :key => key, :columnFamily => columnFamily, :isAscending => isAscending, :count => count)
+    def send_get_slice_super(table, key, column_family, start, finish, is_ascending, count)
+      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)
     end
 
     def recv_get_slice_super()
@@ -176,13 +159,13 @@ module Cassandra
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_slice_super failed: unknown result')
     end
 
-    def get_slice_super_by_names(tablename, key, columnFamily, superColumnNames)
-      send_get_slice_super_by_names(tablename, key, columnFamily, superColumnNames)
+    def get_slice_super_by_names(table, key, column_family, super_column_names)
+      send_get_slice_super_by_names(table, key, column_family, super_column_names)
       return recv_get_slice_super_by_names()
     end
 
-    def send_get_slice_super_by_names(tablename, key, columnFamily, superColumnNames)
-      send_message('get_slice_super_by_names', Get_slice_super_by_names_args, :tablename => tablename, :key => key, :columnFamily => columnFamily, :superColumnNames => superColumnNames)
+    def send_get_slice_super_by_names(table, key, column_family, super_column_names)
+      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)
     end
 
     def recv_get_slice_super_by_names()
@@ -192,46 +175,46 @@ module Cassandra
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_slice_super_by_names failed: unknown result')
     end
 
-    def get_superColumn(tablename, key, superColumnPath)
-      send_get_superColumn(tablename, key, superColumnPath)
-      return recv_get_superColumn()
+    def get_super_column(table, key, super_column_path)
+      send_get_super_column(table, key, super_column_path)
+      return recv_get_super_column()
     end
 
-    def send_get_superColumn(tablename, key, superColumnPath)
-      send_message('get_superColumn', Get_superColumn_args, :tablename => tablename, :key => key, :superColumnPath => superColumnPath)
+    def send_get_super_column(table, key, super_column_path)
+      send_message('get_super_column', Get_super_column_args, :table => table, :key => key, :super_column_path => super_column_path)
     end
 
-    def recv_get_superColumn()
-      result = receive_message(Get_superColumn_result)
+    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_superColumn failed: unknown result')
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_super_column failed: unknown result')
     end
 
-    def batch_insert_superColumn(batchMutationSuper, block_for)
-      send_batch_insert_superColumn(batchMutationSuper, block_for)
-      recv_batch_insert_superColumn()
+    def batch_insert_super_column(table, batch_mutation_super, block_for)
+      send_batch_insert_super_column(table, batch_mutation_super, block_for)
+      recv_batch_insert_super_column()
     end
 
-    def send_batch_insert_superColumn(batchMutationSuper, block_for)
-      send_message('batch_insert_superColumn', Batch_insert_superColumn_args, :batchMutationSuper => batchMutationSuper, :block_for => block_for)
+    def send_batch_insert_super_column(table, batch_mutation_super, block_for)
+      send_message('batch_insert_super_column', Batch_insert_super_column_args, :table => table, :batch_mutation_super => batch_mutation_super, :block_for => block_for)
     end
 
-    def recv_batch_insert_superColumn()
-      result = receive_message(Batch_insert_superColumn_result)
+    def recv_batch_insert_super_column()
+      result = receive_message(Batch_insert_super_column_result)
       raise result.ire unless result.ire.nil?
       raise result.ue unless result.ue.nil?
       return
     end
 
-    def get_key_range(tablename, columnFamilies, startWith, stopAt, maxResults)
-      send_get_key_range(tablename, columnFamilies, startWith, stopAt, maxResults)
+    def get_key_range(table, column_family, startWith, stopAt, maxResults)
+      send_get_key_range(table, column_family, startWith, stopAt, maxResults)
       return recv_get_key_range()
     end
 
-    def send_get_key_range(tablename, columnFamilies, startWith, stopAt, maxResults)
-      send_message('get_key_range', Get_key_range_args, :tablename => tablename, :columnFamilies => columnFamilies, :startWith => startWith, :stopAt => stopAt, :maxResults => maxResults)
+    def send_get_key_range(table, column_family, startWith, stopAt, maxResults)
+      send_message('get_key_range', Get_key_range_args, :table => table, :column_family => column_family, :startWith => startWith, :stopAt => stopAt, :maxResults => maxResults)
     end
 
     def recv_get_key_range()
@@ -307,24 +290,11 @@ module Cassandra
   class Processor
     include ::Thrift::Processor
 
-    def process_get_slice_by_name_range(seqid, iprot, oprot)
-      args = read_args(iprot, Get_slice_by_name_range_args)
-      result = Get_slice_by_name_range_result.new()
-      begin
-        result.success = @handler.get_slice_by_name_range(args.tablename, args.key, args.columnParent, args.start, args.finish, args.count)
-      rescue InvalidRequestException => ire
-        result.ire = ire
-      rescue NotFoundException => nfe
-        result.nfe = nfe
-      end
-      write_result(result, oprot, 'get_slice_by_name_range', seqid)
-    end
-
     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.tablename, args.key, args.columnParent, args.columnNames)
+        result.success = @handler.get_slice_by_names(args.table, args.key, args.column_parent, args.column_names)
       rescue InvalidRequestException => ire
         result.ire = ire
       rescue NotFoundException => nfe
@@ -337,7 +307,7 @@ module Cassandra
       args = read_args(iprot, Get_slice_args)
       result = Get_slice_result.new()
       begin
-        result.success = @handler.get_slice(args.tablename, args.key, args.columnParent, args.isAscending, args.count)
+        result.success = @handler.get_slice(args.table, args.key, args.column_parent, args.start, args.finish, args.is_ascending, args.count)
       rescue InvalidRequestException => ire
         result.ire = ire
       rescue NotFoundException => nfe
@@ -350,7 +320,7 @@ module Cassandra
       args = read_args(iprot, Get_column_args)
       result = Get_column_result.new()
       begin
-        result.success = @handler.get_column(args.tablename, args.key, args.columnPath)
+        result.success = @handler.get_column(args.table, args.key, args.column_path)
       rescue InvalidRequestException => ire
         result.ire = ire
       rescue NotFoundException => nfe
@@ -363,7 +333,7 @@ module Cassandra
       args = read_args(iprot, Get_column_count_args)
       result = Get_column_count_result.new()
       begin
-        result.success = @handler.get_column_count(args.tablename, args.key, args.columnParent)
+        result.success = @handler.get_column_count(args.table, args.key, args.column_parent)
       rescue InvalidRequestException => ire
         result.ire = ire
       end
@@ -374,7 +344,7 @@ module Cassandra
       args = read_args(iprot, Insert_args)
       result = Insert_result.new()
       begin
-        @handler.insert(args.tablename, args.key, args.columnPath, args.cellData, args.timestamp, args.block_for)
+        @handler.insert(args.table, args.key, args.column_path, args.value, args.timestamp, args.block_for)
       rescue InvalidRequestException => ire
         result.ire = ire
       rescue UnavailableException => ue
@@ -387,7 +357,7 @@ module Cassandra
       args = read_args(iprot, Batch_insert_args)
       result = Batch_insert_result.new()
       begin
-        @handler.batch_insert(args.batchMutation, args.block_for)
+        @handler.batch_insert(args.table, args.batch_mutation, args.block_for)
       rescue InvalidRequestException => ire
         result.ire = ire
       rescue UnavailableException => ue
@@ -400,7 +370,7 @@ module Cassandra
       args = read_args(iprot, Remove_args)
       result = Remove_result.new()
       begin
-        @handler.remove(args.tablename, args.key, args.columnPathOrParent, args.timestamp, args.block_for)
+        @handler.remove(args.table, args.key, args.column_path_or_parent, args.timestamp, args.block_for)
       rescue InvalidRequestException => ire
         result.ire = ire
       rescue UnavailableException => ue
@@ -413,7 +383,7 @@ module Cassandra
       args = read_args(iprot, Get_columns_since_args)
       result = Get_columns_since_result.new()
       begin
-        result.success = @handler.get_columns_since(args.tablename, args.key, args.columnParent, args.timeStamp)
+        result.success = @handler.get_columns_since(args.table, args.key, args.column_parent, args.timeStamp)
       rescue InvalidRequestException => ire
         result.ire = ire
       rescue NotFoundException => nfe
@@ -426,7 +396,7 @@ module Cassandra
       args = read_args(iprot, Get_slice_super_args)
       result = Get_slice_super_result.new()
       begin
-        result.success = @handler.get_slice_super(args.tablename, args.key, args.columnFamily, args.isAscending, args.count)
+        result.success = @handler.get_slice_super(args.table, args.key, args.column_family, args.start, args.finish, args.is_ascending, args.count)
       rescue InvalidRequestException => ire
         result.ire = ire
       end
@@ -437,44 +407,44 @@ module Cassandra
       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.tablename, args.key, args.columnFamily, args.superColumnNames)
+        result.success = @handler.get_slice_super_by_names(args.table, args.key, args.column_family, args.super_column_names)
       rescue InvalidRequestException => ire
         result.ire = ire
       end
       write_result(result, oprot, 'get_slice_super_by_names', seqid)
     end
 
-    def process_get_superColumn(seqid, iprot, oprot)
-      args = read_args(iprot, Get_superColumn_args)
-      result = Get_superColumn_result.new()
+    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_superColumn(args.tablename, args.key, args.superColumnPath)
+        result.success = @handler.get_super_column(args.table, args.key, args.super_column_path)
       rescue InvalidRequestException => ire
         result.ire = ire
       rescue NotFoundException => nfe
         result.nfe = nfe
       end
-      write_result(result, oprot, 'get_superColumn', seqid)
+      write_result(result, oprot, 'get_super_column', seqid)
     end
 
-    def process_batch_insert_superColumn(seqid, iprot, oprot)
-      args = read_args(iprot, Batch_insert_superColumn_args)
-      result = Batch_insert_superColumn_result.new()
+    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_superColumn(args.batchMutationSuper, args.block_for)
+        @handler.batch_insert_super_column(args.table, args.batch_mutation_super, args.block_for)
       rescue InvalidRequestException => ire
         result.ire = ire
       rescue UnavailableException => ue
         result.ue = ue
       end
-      write_result(result, oprot, 'batch_insert_superColumn', seqid)
+      write_result(result, oprot, 'batch_insert_super_column', seqid)
     end
 
     def process_get_key_range(seqid, iprot, oprot)
       args = read_args(iprot, Get_key_range_args)
       result = Get_key_range_result.new()
       begin
-        result.success = @handler.get_key_range(args.tablename, args.columnFamilies, args.startWith, args.stopAt, args.maxResults)
+        result.success = @handler.get_key_range(args.table, args.column_family, args.startWith, args.stopAt, args.maxResults)
       rescue InvalidRequestException => ire
         result.ire = ire
       end
@@ -517,65 +487,19 @@ module Cassandra
 
   # HELPER FUNCTIONS AND STRUCTURES
 
-  class Get_slice_by_name_range_args
-    include ::Thrift::Struct
-    TABLENAME = 1
-    KEY = 2
-    COLUMNPARENT = 3
-    START = 4
-    FINISH = 5
-    COUNT = 6
-
-    ::Thrift::Struct.field_accessor self, :tablename, :key, :columnParent, :start, :finish, :count
-    FIELDS = {
-      TABLENAME => {:type => ::Thrift::Types::STRING, :name => 'tablename'},
-      KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
-      COLUMNPARENT => {:type => ::Thrift::Types::STRING, :name => 'columnParent'},
-      START => {:type => ::Thrift::Types::STRING, :name => 'start'},
-      FINISH => {:type => ::Thrift::Types::STRING, :name => 'finish'},
-      COUNT => {:type => ::Thrift::Types::I32, :name => 'count', :default => -1}
-    }
-
-    def struct_fields; FIELDS; end
-
-    def validate
-    end
-
-  end
-
-  class Get_slice_by_name_range_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 => Column_t}},
-      IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => InvalidRequestException},
-      NFE => {:type => ::Thrift::Types::STRUCT, :name => 'nfe', :class => NotFoundException}
-    }
-
-    def struct_fields; FIELDS; end
-
-    def validate
-    end
-
-  end
-
   class Get_slice_by_names_args
     include ::Thrift::Struct
-    TABLENAME = 1
+    TABLE = 1
     KEY = 2
-    COLUMNPARENT = 3
-    COLUMNNAMES = 4
+    COLUMN_PARENT = 3
+    COLUMN_NAMES = 4
 
-    ::Thrift::Struct.field_accessor self, :tablename, :key, :columnParent, :columnNames
+    ::Thrift::Struct.field_accessor self, :table, :key, :column_parent, :column_names
     FIELDS = {
-      TABLENAME => {:type => ::Thrift::Types::STRING, :name => 'tablename'},
+      TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
       KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
-      COLUMNPARENT => {:type => ::Thrift::Types::STRING, :name => 'columnParent'},
-      COLUMNNAMES => {:type => ::Thrift::Types::LIST, :name => 'columnNames', :element => {:type => ::Thrift::Types::STRING}}
+      COLUMN_PARENT => {:type => ::Thrift::Types::STRUCT, :name => 'column_parent', :class => ColumnParent},
+      COLUMN_NAMES => {:type => ::Thrift::Types::LIST, :name => 'column_names', :element => {:type => ::Thrift::Types::STRING}}
     }
 
     def struct_fields; FIELDS; end
@@ -593,7 +517,7 @@ module Cassandra
 
     ::Thrift::Struct.field_accessor self, :success, :ire, :nfe
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => Column_t}},
+      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => Column}},
       IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => InvalidRequestException},
       NFE => {:type => ::Thrift::Types::STRUCT, :name => 'nfe', :class => NotFoundException}
     }
@@ -607,19 +531,23 @@ module Cassandra
 
   class Get_slice_args
     include ::Thrift::Struct
-    TABLENAME = 1
+    TABLE = 1
     KEY = 2
-    COLUMNPARENT = 3
-    ISASCENDING = 4
-    COUNT = 5
+    COLUMN_PARENT = 3
+    START = 4
+    FINISH = 5
+    IS_ASCENDING = 6
+    COUNT = 7
 
-    ::Thrift::Struct.field_accessor self, :tablename, :key, :columnParent, :isAscending, :count
+    ::Thrift::Struct.field_accessor self, :table, :key, :column_parent, :start, :finish, :is_ascending, :count
     FIELDS = {
-      TABLENAME => {:type => ::Thrift::Types::STRING, :name => 'tablename'},
+      TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
       KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
-      COLUMNPARENT => {:type => ::Thrift::Types::STRING, :name => 'columnParent'},
-      ISASCENDING => {:type => ::Thrift::Types::BOOL, :name => 'isAscending'},
-      COUNT => {:type => ::Thrift::Types::I32, :name => 'count'}
+      COLUMN_PARENT => {:type => ::Thrift::Types::STRUCT, :name => 'column_parent', :class => 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}
     }
 
     def struct_fields; FIELDS; end
@@ -637,7 +565,7 @@ module Cassandra
 
     ::Thrift::Struct.field_accessor self, :success, :ire, :nfe
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => Column_t}},
+      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => Column}},
       IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => InvalidRequestException},
       NFE => {:type => ::Thrift::Types::STRUCT, :name => 'nfe', :class => NotFoundException}
     }
@@ -651,15 +579,15 @@ module Cassandra
 
   class Get_column_args
     include ::Thrift::Struct
-    TABLENAME = 1
+    TABLE = 1
     KEY = 2
-    COLUMNPATH = 3
+    COLUMN_PATH = 3
 
-    ::Thrift::Struct.field_accessor self, :tablename, :key, :columnPath
+    ::Thrift::Struct.field_accessor self, :table, :key, :column_path
     FIELDS = {
-      TABLENAME => {:type => ::Thrift::Types::STRING, :name => 'tablename'},
+      TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
       KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
-      COLUMNPATH => {:type => ::Thrift::Types::STRING, :name => 'columnPath'}
+      COLUMN_PATH => {:type => ::Thrift::Types::STRUCT, :name => 'column_path', :class => ColumnPath}
     }
 
     def struct_fields; FIELDS; end
@@ -677,7 +605,7 @@ module Cassandra
 
     ::Thrift::Struct.field_accessor self, :success, :ire, :nfe
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => Column_t},
+      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => Column},
       IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => InvalidRequestException},
       NFE => {:type => ::Thrift::Types::STRUCT, :name => 'nfe', :class => NotFoundException}
     }
@@ -691,15 +619,15 @@ module Cassandra
 
   class Get_column_count_args
     include ::Thrift::Struct
-    TABLENAME = 1
+    TABLE = 1
     KEY = 2
-    COLUMNPARENT = 3
+    COLUMN_PARENT = 3
 
-    ::Thrift::Struct.field_accessor self, :tablename, :key, :columnParent
+    ::Thrift::Struct.field_accessor self, :table, :key, :column_parent
     FIELDS = {
-      TABLENAME => {:type => ::Thrift::Types::STRING, :name => 'tablename'},
+      TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
       KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
-      COLUMNPARENT => {:type => ::Thrift::Types::STRING, :name => 'columnParent'}
+      COLUMN_PARENT => {:type => ::Thrift::Types::STRUCT, :name => 'column_parent', :class => ColumnParent}
     }
 
     def struct_fields; FIELDS; end
@@ -729,19 +657,19 @@ module Cassandra
 
   class Insert_args
     include ::Thrift::Struct
-    TABLENAME = 1
+    TABLE = 1
     KEY = 2
-    COLUMNPATH = 3
-    CELLDATA = 4
+    COLUMN_PATH = 3
+    VALUE = 4
     TIMESTAMP = 5
     BLOCK_FOR = 6
 
-    ::Thrift::Struct.field_accessor self, :tablename, :key, :columnPath, :cellData, :timestamp, :block_for
+    ::Thrift::Struct.field_accessor self, :table, :key, :column_path, :value, :timestamp, :block_for
     FIELDS = {
-      TABLENAME => {:type => ::Thrift::Types::STRING, :name => 'tablename'},
+      TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
       KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
-      COLUMNPATH => {:type => ::Thrift::Types::STRING, :name => 'columnPath'},
-      CELLDATA => {:type => ::Thrift::Types::STRING, :name => 'cellData'},
+      COLUMN_PATH => {:type => ::Thrift::Types::STRUCT, :name => 'column_path', :class => ColumnPath},
+      VALUE => {:type => ::Thrift::Types::STRING, :name => 'value'},
       TIMESTAMP => {:type => ::Thrift::Types::I64, :name => 'timestamp'},
       BLOCK_FOR => {:type => ::Thrift::Types::I32, :name => 'block_for', :default => 0}
     }
@@ -773,12 +701,14 @@ module Cassandra
 
   class Batch_insert_args
     include ::Thrift::Struct
-    BATCHMUTATION = 1
-    BLOCK_FOR = 2
+    TABLE = 1
+    BATCH_MUTATION = 2
+    BLOCK_FOR = 3
 
-    ::Thrift::Struct.field_accessor self, :batchMutation, :block_for
+    ::Thrift::Struct.field_accessor self, :table, :batch_mutation, :block_for
     FIELDS = {
-      BATCHMUTATION => {:type => ::Thrift::Types::STRUCT, :name => 'batchMutation', :class => Batch_mutation_t},
+      TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
+      BATCH_MUTATION => {:type => ::Thrift::Types::STRUCT, :name => 'batch_mutation', :class => BatchMutation},
       BLOCK_FOR => {:type => ::Thrift::Types::I32, :name => 'block_for', :default => 0}
     }
 
@@ -809,17 +739,17 @@ module Cassandra
 
   class Remove_args
     include ::Thrift::Struct
-    TABLENAME = 1
+    TABLE = 1
     KEY = 2
-    COLUMNPATHORPARENT = 3
+    COLUMN_PATH_OR_PARENT = 3
     TIMESTAMP = 4
     BLOCK_FOR = 5
 
-    ::Thrift::Struct.field_accessor self, :tablename, :key, :columnPathOrParent, :timestamp, :block_for
+    ::Thrift::Struct.field_accessor self, :table, :key, :column_path_or_parent, :timestamp, :block_for
     FIELDS = {
-      TABLENAME => {:type => ::Thrift::Types::STRING, :name => 'tablename'},
+      TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
       KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
-      COLUMNPATHORPARENT => {:type => ::Thrift::Types::STRING, :name => 'columnPathOrParent'},
+      COLUMN_PATH_OR_PARENT => {:type => ::Thrift::Types::STRUCT, :name => 'column_path_or_parent', :class => ColumnPathOrParent},
       TIMESTAMP => {:type => ::Thrift::Types::I64, :name => 'timestamp'},
       BLOCK_FOR => {:type => ::Thrift::Types::I32, :name => 'block_for', :default => 0}
     }
@@ -851,16 +781,16 @@ module Cassandra
 
   class Get_columns_since_args
     include ::Thrift::Struct
-    TABLENAME = 1
+    TABLE = 1
     KEY = 2
-    COLUMNPARENT = 3
+    COLUMN_PARENT = 3
     TIMESTAMP = 4
 
-    ::Thrift::Struct.field_accessor self, :tablename, :key, :columnParent, :timeStamp
+    ::Thrift::Struct.field_accessor self, :table, :key, :column_parent, :timeStamp
     FIELDS = {
-      TABLENAME => {:type => ::Thrift::Types::STRING, :name => 'tablename'},
+      TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
       KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
-      COLUMNPARENT => {:type => ::Thrift::Types::STRING, :name => 'columnParent'},
+      COLUMN_PARENT => {:type => ::Thrift::Types::STRUCT, :name => 'column_parent', :class => ColumnParent},
       TIMESTAMP => {:type => ::Thrift::Types::I64, :name => 'timeStamp'}
     }
 
@@ -879,7 +809,7 @@ module Cassandra
 
     ::Thrift::Struct.field_accessor self, :success, :ire, :nfe
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => Column_t}},
+      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => Column}},
       IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => InvalidRequestException},
       NFE => {:type => ::Thrift::Types::STRUCT, :name => 'nfe', :class => NotFoundException}
     }
@@ -893,19 +823,23 @@ module Cassandra
 
   class Get_slice_super_args
     include ::Thrift::Struct
-    TABLENAME = 1
+    TABLE = 1
     KEY = 2
-    COLUMNFAMILY = 3
-    ISASCENDING = 4
-    COUNT = 5
+    COLUMN_FAMILY = 3
+    START = 4
+    FINISH = 5
+    IS_ASCENDING = 6
+    COUNT = 7
 
-    ::Thrift::Struct.field_accessor self, :tablename, :key, :columnFamily, :isAscending, :count
+    ::Thrift::Struct.field_accessor self, :table, :key, :column_family, :start, :finish, :is_ascending, :count
     FIELDS = {
-      TABLENAME => {:type => ::Thrift::Types::STRING, :name => 'tablename'},
+      TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
       KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
-      COLUMNFAMILY => {:type => ::Thrift::Types::STRING, :name => 'columnFamily'},
-      ISASCENDING => {:type => ::Thrift::Types::BOOL, :name => 'isAscending'},
-      COUNT => {:type => ::Thrift::Types::I32, :name => 'count'}
+      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}
     }
 
     def struct_fields; FIELDS; end
@@ -922,7 +856,7 @@ module Cassandra
 
     ::Thrift::Struct.field_accessor self, :success, :ire
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => SuperColumn_t}},
+      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => SuperColumn}},
       IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => InvalidRequestException}
     }
 
@@ -935,17 +869,17 @@ module Cassandra
 
   class Get_slice_super_by_names_args
     include ::Thrift::Struct
-    TABLENAME = 1
+    TABLE = 1
     KEY = 2
-    COLUMNFAMILY = 3
-    SUPERCOLUMNNAMES = 4
+    COLUMN_FAMILY = 3
+    SUPER_COLUMN_NAMES = 4
 
-    ::Thrift::Struct.field_accessor self, :tablename, :key, :columnFamily, :superColumnNames
+    ::Thrift::Struct.field_accessor self, :table, :key, :column_family, :super_column_names
     FIELDS = {
-      TABLENAME => {:type => ::Thrift::Types::STRING, :name => 'tablename'},
+      TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
       KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
-      COLUMNFAMILY => {:type => ::Thrift::Types::STRING, :name => 'columnFamily'},
-      SUPERCOLUMNNAMES => {:type => ::Thrift::Types::LIST, :name => 'superColumnNames', :element => {:type => ::Thrift::Types::STRING}}
+      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}}
     }
 
     def struct_fields; FIELDS; end
@@ -962,7 +896,7 @@ module Cassandra
 
     ::Thrift::Struct.field_accessor self, :success, :ire
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => SuperColumn_t}},
+      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => SuperColumn}},
       IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => InvalidRequestException}
     }
 
@@ -973,17 +907,17 @@ module Cassandra
 
   end
 
-  class Get_superColumn_args
+  class Get_super_column_args
     include ::Thrift::Struct
-    TABLENAME = 1
+    TABLE = 1
     KEY = 2
-    SUPERCOLUMNPATH = 3
+    SUPER_COLUMN_PATH = 3
 
-    ::Thrift::Struct.field_accessor self, :tablename, :key, :superColumnPath
+    ::Thrift::Struct.field_accessor self, :table, :key, :super_column_path
     FIELDS = {
-      TABLENAME => {:type => ::Thrift::Types::STRING, :name => 'tablename'},
+      TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
       KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
-      SUPERCOLUMNPATH => {:type => ::Thrift::Types::STRING, :name => 'superColumnPath'}
+      SUPER_COLUMN_PATH => {:type => ::Thrift::Types::STRUCT, :name => 'super_column_path', :class => SuperColumnPath}
     }
 
     def struct_fields; FIELDS; end
@@ -993,7 +927,7 @@ module Cassandra
 
   end
 
-  class Get_superColumn_result
+  class Get_super_column_result
     include ::Thrift::Struct
     SUCCESS = 0
     IRE = 1
@@ -1001,7 +935,7 @@ module Cassandra
 
     ::Thrift::Struct.field_accessor self, :success, :ire, :nfe
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => SuperColumn_t},
+      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => SuperColumn},
       IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => InvalidRequestException},
       NFE => {:type => ::Thrift::Types::STRUCT, :name => 'nfe', :class => NotFoundException}
     }
@@ -1013,14 +947,16 @@ module Cassandra
 
   end
 
-  class Batch_insert_superColumn_args
+  class Batch_insert_super_column_args
     include ::Thrift::Struct
-    BATCHMUTATIONSUPER = 1
-    BLOCK_FOR = 2
+    TABLE = 1
+    BATCH_MUTATION_SUPER = 2
+    BLOCK_FOR = 3
 
-    ::Thrift::Struct.field_accessor self, :batchMutationSuper, :block_for
+    ::Thrift::Struct.field_accessor self, :table, :batch_mutation_super, :block_for
     FIELDS = {
-      BATCHMUTATIONSUPER => {:type => ::Thrift::Types::STRUCT, :name => 'batchMutationSuper', :class => Batch_mutation_super_t},
+      TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
+      BATCH_MUTATION_SUPER => {:type => ::Thrift::Types::STRUCT, :name => 'batch_mutation_super', :class => BatchMutationSuper},
       BLOCK_FOR => {:type => ::Thrift::Types::I32, :name => 'block_for', :default => 0}
     }
 
@@ -1031,7 +967,7 @@ module Cassandra
 
   end
 
-  class Batch_insert_superColumn_result
+  class Batch_insert_super_column_result
     include ::Thrift::Struct
     IRE = 1
     UE = 2
@@ -1051,20 +987,19 @@ module Cassandra
 
   class Get_key_range_args
     include ::Thrift::Struct
-    TABLENAME = 1
-    COLUMNFAMILIES = 2
+    TABLE = 1
+    COLUMN_FAMILY = 2
     STARTWITH = 3
     STOPAT = 4
     MAXRESULTS = 5
 
-    ::Thrift::Struct.field_accessor self, :tablename, :columnFamilies, :startWith, :stopAt, :maxResults
+    ::Thrift::Struct.field_accessor self, :table, :column_family, :startWith, :stopAt, :maxResults
     FIELDS = {
-      TABLENAME => {:type => ::Thrift::Types::STRING, :name => 'tablename'},
-      COLUMNFAMILIES => {:type => ::Thrift::Types::LIST, :name => 'columnFamilies', :default => [
-      ], :element => {:type => ::Thrift::Types::STRING}},
+      TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
+      COLUMN_FAMILY => {:type => ::Thrift::Types::STRING, :name => 'column_family'},
       STARTWITH => {:type => ::Thrift::Types::STRING, :name => 'startWith', :default => %q""},
       STOPAT => {:type => ::Thrift::Types::STRING, :name => 'stopAt', :default => %q""},
-      MAXRESULTS => {:type => ::Thrift::Types::I32, :name => 'maxResults', :default => 1000}
+      MAXRESULTS => {:type => ::Thrift::Types::I32, :name => 'maxResults', :default => 100}
     }
 
     def struct_fields; FIELDS; end
@@ -1212,7 +1147,7 @@ module Cassandra
 
     ::Thrift::Struct.field_accessor self, :success
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => CqlResult_t}
+      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => CqlResult}
     }
 
     def struct_fields; FIELDS; end