cassandra 0.5.6.2 → 0.6

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v0.6. Use thrift_client gem.
+
 v0.5.6.2. Release process was busted.
 
 v0.5.6. Real multiget.

data/Manifest

@@ -17,7 +17,6 @@ lib/cassandra/debug.rb
 lib/cassandra/long.rb
 lib/cassandra/ordered_hash.rb
 lib/cassandra/protocol.rb
-lib/cassandra/safe_client.rb
 lib/cassandra/time.rb
 lib/cassandra/uuid.rb
 test/cassandra_test.rb

data/Rakefile

@@ -8,7 +8,7 @@ unless ENV['FROM_BIN_CASSANDRA_HELPER']
     p.project = "fauna"
     p.summary = "A Ruby client for the Cassandra distributed database."
     p.rubygems_version = ">= 0.8"
-    p.dependencies = ['thrift', 'rake']
+    p.dependencies = ['thrift_client', 'rake']
     p.ignore_pattern = /^(data|vendor\/cassandra|cassandra|vendor\/thrift)/
     p.rdoc_pattern = /^(lib|bin|tasks|ext)|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
     p.url = "http://blog.evanweaver.com/files/doc/fauna/cassandra/"
@@ -16,16 +16,16 @@ unless ENV['FROM_BIN_CASSANDRA_HELPER']
   end
 end
 
-REVISION = "33ac4dddb02c4b99dda34eefe842b2fcf4e81c6b"
+REVISION = "c1fa17c0e359fa032bdb2d6b5f63120359ff881f"
 
-PATCHES = [
-  "http://issues.apache.org/jira/secure/attachment/12418212/CASSANDRA-336-code.diff",
-  "http://issues.apache.org/jira/secure/attachment/12418213/CASSANDRA-336-thrift.diff"]
+PATCHES = []
 
 CASSANDRA_HOME = "#{ENV['HOME']}/cassandra/server"
 
 CASSANDRA_TEST = "#{ENV['HOME']}/cassandra/test"
 
+GIT_REPO = "git://github.com/ryanking/cassandra.git"
+
 directory CASSANDRA_TEST
 
 desc "Start Cassandra"
@@ -63,42 +63,36 @@ task :git do
 end
 
 desc "Checkout Cassandra from git"
-task :checkout_cassandra => [:java, :git] do
+task :clone_cassandra => [:java, :git] do
   # Like a git submodule, but all in one more obvious place
   unless File.exist?(CASSANDRA_HOME)
     puts "Checking Cassandra out from git"
-    cmd = "git clone git://git.apache.org/cassandra.git #{CASSANDRA_HOME}"
+    cmd = "git clone #{GIT_REPO} #{CASSANDRA_HOME}"
     if !system(cmd)
       put "Checkout failed. Try:\n  #{cmd}"
       exit(1)
     end
-  end  
+  end
 end
 
-desc "Apply patches to Cassandra checkout; use RESET=1 to force"
-task :patch_cassandra => [:checkout_cassandra] do
-  # Verify checkout revision and patchset
-  Dir.chdir(CASSANDRA_HOME) do  
-    current_checkout = `git show HEAD~#{PATCHES.size} | head -n1`
+desc "Check out the right revision"
+task :checkout_cassandra => [:clone_cassandra] do
+  Dir.chdir(CASSANDRA_HOME) do
+    current_checkout = `git log | head -n1`
     if !current_checkout.include?(REVISION)
-      puts "Updating Cassandra and applying patches"
+      puts "Updating Cassandra."
       system("rm -rf #{CASSANDRA_TEST}/data")
       system("ant clean && git fetch && git reset #{REVISION} --hard")
-      # Delete untracked files, so that the patchs can apply again
+      # Delete untracked files
       Array(`git status`[/Untracked files:(.*)$/m, 1].to_s.split("\n")[3..-1]).each do |file|
         File.unlink(file.sub(/^.\s+/, "")) rescue nil
       end
-      # Patch, with a handy commit for each one
-      PATCHES.each do |url|
-        raise "#{url} failed" unless system("curl #{url} | patch -p1")
-        system("git commit -a -m 'Applied patch: #{url.inspect}'")
-      end
     end
   end
 end
 
 desc "Rebuild Cassandra"
-task :build_cassandra => [:patch_cassandra] do
+task :build_cassandra => [:checkout_cassandra] do
   unless File.exist?("#{CASSANDRA_HOME}/build")
     puts "Building Cassandra"
     cmd = "cd #{CASSANDRA_HOME} && ant"

data/cassandra.gemspec

@@ -2,23 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra}
-  s.version = "0.5.6.2"
+  s.version = "0.6"
 
   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-09-01}
+  s.date = %q{2009-11-18}
   s.default_executable = %q{cassandra_helper}
   s.description = %q{A Ruby client for the Cassandra distributed database.}
   s.email = %q{}
   s.executables = ["cassandra_helper"]
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "bin/cassandra_helper", "lib/cassandra.rb", "lib/cassandra/array.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/columns.rb", "lib/cassandra/comparable.rb", "lib/cassandra/constants.rb", "lib/cassandra/debug.rb", "lib/cassandra/long.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/protocol.rb", "lib/cassandra/safe_client.rb", "lib/cassandra/time.rb", "lib/cassandra/uuid.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "bin/cassandra_helper", "conf/cassandra.in.sh", "conf/log4j.properties", "conf/storage-conf.xml", "lib/cassandra.rb", "lib/cassandra/array.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/columns.rb", "lib/cassandra/comparable.rb", "lib/cassandra/constants.rb", "lib/cassandra/debug.rb", "lib/cassandra/long.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/protocol.rb", "lib/cassandra/safe_client.rb", "lib/cassandra/time.rb", "lib/cassandra/uuid.rb", "test/cassandra_test.rb", "test/comparable_types_test.rb", "test/test_helper.rb", "vendor/gen-rb/cassandra.rb", "vendor/gen-rb/cassandra_constants.rb", "vendor/gen-rb/cassandra_types.rb", "cassandra.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "bin/cassandra_helper", "lib/cassandra.rb", "lib/cassandra/array.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/columns.rb", "lib/cassandra/comparable.rb", "lib/cassandra/constants.rb", "lib/cassandra/debug.rb", "lib/cassandra/long.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/protocol.rb", "lib/cassandra/time.rb", "lib/cassandra/uuid.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "bin/cassandra_helper", "conf/cassandra.in.sh", "conf/log4j.properties", "conf/storage-conf.xml", "lib/cassandra.rb", "lib/cassandra/array.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/columns.rb", "lib/cassandra/comparable.rb", "lib/cassandra/constants.rb", "lib/cassandra/debug.rb", "lib/cassandra/long.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/protocol.rb", "lib/cassandra/time.rb", "lib/cassandra/uuid.rb", "test/cassandra_test.rb", "test/comparable_types_test.rb", "test/test_helper.rb", "vendor/gen-rb/cassandra.rb", "vendor/gen-rb/cassandra_constants.rb", "vendor/gen-rb/cassandra_types.rb", "cassandra.gemspec"]
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/cassandra/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cassandra", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fauna}
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.signing_key = %q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-private_key.pem}
   s.summary = %q{A Ruby client for the Cassandra distributed database.}
   s.test_files = ["test/cassandra_test.rb", "test/comparable_types_test.rb", "test/test_helper.rb"]
@@ -28,14 +28,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thrift>, [">= 0"])
+      s.add_runtime_dependency(%q<thrift_client>, [">= 0"])
       s.add_runtime_dependency(%q<rake>, [">= 0"])
     else
-      s.add_dependency(%q<thrift>, [">= 0"])
+      s.add_dependency(%q<thrift_client>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
     end
   else
-    s.add_dependency(%q<thrift>, [">= 0"])
+    s.add_dependency(%q<thrift_client>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
   end
 end

data/conf/cassandra.in.sh

@@ -36,7 +36,7 @@ JVM_OPTS=" \
         -ea \
         -Xdebug \
         -Xrunjdwp:transport=dt_socket,server=y,address=8888,suspend=n \
-        -Xms128M \
+        -Xms512M \
         -Xmx1G \
         -XX:SurvivorRatio=8 \
         -XX:TargetSurvivorRatio=90 \

data/conf/storage-conf.xml

@@ -51,6 +51,17 @@
         <ColumnFamily CompareWith="LongType" Name="Blogs"/>
         <ColumnFamily CompareWith="LongType" Name="Comments"/>
       </Keyspace>
+      <Keyspace Name="CassandraObject">
+        <KeysCachedFraction>0.01</KeysCachedFraction>
+        <ColumnFamily CompareWith="UTF8Type" Name="Customers" />
+        <ColumnFamily CompareWith="UTF8Type" CompareSubcolumnsWith="TimeUUIDType" ColumnType="Super" Name="CustomerRelationships" />
+        <ColumnFamily CompareWith="UTF8Type" CompareSubcolumnsWith="TimeUUIDType" ColumnType="Super" Name="CustomersByLastName" />
+        <ColumnFamily CompareWith="UTF8Type" Name="Invoices" />
+        <ColumnFamily CompareWith="UTF8Type" CompareSubcolumnsWith="TimeUUIDType" ColumnType="Super" Name="InvoiceRelationships" />
+        <ColumnFamily CompareWith="UTF8Type" Name="InvoicesByNumber" />
+        <ColumnFamily CompareWith="UTF8Type" Name="Payments" />
+        <ColumnFamily CompareWith="UTF8Type" Name="Appointments" />
+      </Keyspace>
     </Keyspaces>
 
     <!-- Partitioner: any IPartitioner may be used, including your own

data/lib/cassandra.rb

@@ -1,20 +1,17 @@
-
-require 'zlib'
 require 'rubygems'
-require 'thrift'
+require 'thrift_client'
 
-HERE = File.expand_path(File.dirname(__FILE__))
+here = File.expand_path(File.dirname(__FILE__))
 
-$LOAD_PATH << "#{HERE}/../vendor/gen-rb"
-require "#{HERE}/../vendor/gen-rb/cassandra"
+$LOAD_PATH << "#{here}/../vendor/gen-rb"
+require "#{here}/../vendor/gen-rb/cassandra"
 
-$LOAD_PATH << "#{HERE}"
+$LOAD_PATH << "#{here}"
 require 'cassandra/array'
 require 'cassandra/time'
 require 'cassandra/comparable'
 require 'cassandra/uuid'
 require 'cassandra/long'
-require 'cassandra/safe_client'
 require 'cassandra/ordered_hash'
 require 'cassandra/columns'
 require 'cassandra/protocol'

data/lib/cassandra/cassandra.rb

@@ -52,39 +52,43 @@ class Cassandra
     :reversed => false,
     :consistency => Consistency::ONE
   }.freeze
+  
+  THRIFT_DEFAULTS = {
+    :transport => Thrift::BufferedTransport
+  }.freeze
 
-  attr_reader :keyspace, :host, :port, :serializer, :transport, :client, :schema
+  attr_reader :keyspace, :servers, :schema, :thrift_client_options
 
-  # Instantiate a new Cassandra and open the connection.
-  def initialize(keyspace, host = '127.0.0.1', port = 9160, buffer = true)
+  # Create a new Cassandra instance and open the connection.
+  def initialize(keyspace, servers = "127.0.0.1:9160", thrift_client_options = {})
     @is_super = {}
     @column_name_class = {}
     @sub_column_name_class = {}
+    @thrift_client_options = THRIFT_DEFAULTS.merge(thrift_client_options)
 
     @keyspace = keyspace
-    @host = host
-    @port = port
+    @servers = Array(servers)
+  end
 
-    transport = Thrift::BufferedTransport.new(Thrift::Socket.new(@host, @port))
-    transport.open
-    
-    @client = CassandraThrift::Cassandra::SafeClient.new(
-      CassandraThrift::Cassandra::Client.new(Thrift::BinaryProtocol.new(transport)),
-      transport,
-      !buffer)
-
-    keyspaces = @client.get_string_list_property("keyspaces")
-    unless keyspaces.include?(@keyspace)
-      raise AccessError, "Keyspace #{@keyspace.inspect} not found. Available: #{keyspaces.inspect}"
+
+  def client
+    @client ||= begin
+      client = ThriftClient.new(CassandraThrift::Cassandra::Client, @servers, @thrift_client_options)
+      unless client.get_string_list_property("keyspaces").include?(@keyspace)
+        raise AccessError, "Keyspace #{@keyspace.inspect} not found. Available: #{keyspaces.inspect}"
+      end
+      client
     end
+  end
 
-    @schema = @client.describe_keyspace(@keyspace)
+  def keyspaces
+    @keyspaces ||= client.get_string_list_property("keyspaces")
   end
 
   def inspect
     "#<Cassandra:#{object_id}, @keyspace=#{keyspace.inspect}, @schema={#{
-      schema.map {|name, hash| ":#{name} => #{hash['type'].inspect}"}.join(', ')
-    }}, @host=#{host.inspect}, @port=#{port}>"
+      schema(false).map {|name, hash| ":#{name} => #{hash['type'].inspect}"}.join(', ')
+    }}, @servers=#{servers.inspect}>"
   end
 
 ### Write
@@ -93,17 +97,13 @@ class Cassandra
   # a nested hash for a super column family. Supports the <tt>:consistency</tt>
   # and <tt>:timestamp</tt> options.
   def insert(column_family, key, hash, options = {})
-    column_family, _, _, options = 
-      validate_params(column_family, key, [options], WRITE_DEFAULTS)
+    column_family, _, _, options = validate_params(column_family, key, [options], WRITE_DEFAULTS)
 
-    args = [column_family, hash, options[:timestamp] || Time.stamp]
-    columns = is_super(column_family) ? hash_to_super_columns(*args) : hash_to_columns(*args)
-    mutation = CassandraThrift::BatchMutation.new(
-      :key => key,
-      :cfmap => {column_family => columns},
-      :column_paths => [])
+    timestamp = options[:timestamp] || Time.stamp
+    cfmap = hash_to_cfmap(column_family, hash, timestamp)
+    mutation = [:insert, [key, cfmap, options[:consistency]]]
 
-    @batch ? @batch << mutation : _mutate([mutation], options[:consistency])
+    @batch ? @batch << mutation : _insert(*mutation[1])
   end
 
   ## Delete
@@ -112,17 +112,15 @@ class Cassandra
   # path you request. Supports the <tt>:consistency</tt> and <tt>:timestamp</tt>
   # options.
   def remove(column_family, key, *columns_and_options)
-    column_family, column, sub_column, options = 
-      validate_params(column_family, key, columns_and_options, WRITE_DEFAULTS)
+    column_family, column, sub_column, options = validate_params(column_family, key, columns_and_options, WRITE_DEFAULTS)
 
-    args = {:column_family => column_family, :timestamp => options[:timestamp] || Time.stamp}
+    args = {:column_family => column_family}
     columns = is_super(column_family) ? {:super_column => column, :column => sub_column} : {:column => column}
-    mutation = CassandraThrift::BatchMutation.new(
-      :key => key,
-      :cfmap => {},
-      :column_paths => [CassandraThrift::ColumnPath.new(args.merge(columns))])
-
-    @batch ? @batch << mutation : _mutate([mutation], options[:consistency])
+    column_path = CassandraThrift::ColumnPath.new(args.merge(columns))
+    
+    mutation = [:remove, [key, column_path, options[:timestamp] || Time.stamp, options[:consistency]]]
+    
+    @batch ? @batch << mutation : _remove(*mutation[1])
   end
 
   # Remove all rows in the column family you request. Supports options
@@ -138,7 +136,7 @@ class Cassandra
   # FIXME May not currently delete all records without multiple calls. Waiting
   # for ranged remove support in Cassandra.
   def clear_keyspace!(options = {})
-    @schema.keys.each { |column_family| clear_column_family!(column_family, options) }
+    schema.keys.each { |column_family| clear_column_family!(column_family, options) }
   end
 
 ### Read
@@ -227,12 +225,21 @@ class Cassandra
   # the individual commands.
   def batch(options = {})
     _, _, _, options = 
-      validate_params(@schema.keys.first, "", [options], WRITE_DEFAULTS)
+      validate_params(schema.keys.first, "", [options], WRITE_DEFAULTS)
 
     @batch = []
     yield
     compact_mutations!
-    _mutate(@batch, options[:consistency])
+
+    @batch.each do |mutation|
+      case mutation.first
+      when :insert
+        _insert(*mutation[1])
+      when :remove
+        _remove(*mutation[1])
+      end
+    end
+  ensure
     @batch = nil
   end
 
@@ -243,9 +250,8 @@ class Cassandra
   def validate_params(column_family, keys, args, options)
     options = options.dup
     column_family = column_family.to_s
-
     # Keys
-    Array(keys).each do |key|      
+    [keys].flatten.each do |key|
       raise ArgumentError, "Key #{key.inspect} must be a String for #{calling_method}" unless key.is_a?(String)
     end
     
@@ -282,25 +288,14 @@ class Cassandra
 
   # Roll up queued mutations, to improve atomicity.
   def compact_mutations!
-    mutations = {}
-
-    # Nested hash merge
-    @batch.each do |m|
-      if mutation = mutations[m.key]
-        # Inserts
-        if columns = mutation.cfmap[m.cfmap.keys.first]
-          columns.concat(m.cfmap.values.first)
-        else
-          mutation.cfmap.merge!(m.cfmap)
-        end
-        # Deletes
-        mutation.column_paths.concat(m.column_paths)
-      else
-        mutations[m.key] = m
-      end
-    end
+    #TODO re-do this rollup
+  end
 
-    # FIXME Return atomic thrift thingy
-    @batch = mutations.values
+  def schema(load=true)
+    if !load && !@schema
+      []
+    else
+      @schema ||= client.describe_keyspace(@keyspace)
+    end
   end
 end

data/lib/cassandra/columns.rb

@@ -3,19 +3,19 @@ class Cassandra
   # A bunch of crap, mostly related to introspecting on column types
   module Columns #:nodoc:
     private
-    
+
     def is_super(column_family)
       @is_super[column_family] ||= column_family_property(column_family, 'Type') == "Super"
     end
-    
+
     def column_name_class(column_family)
       @column_name_class[column_family] ||= column_name_class_for_key(column_family, "CompareWith")
     end
-    
+
     def sub_column_name_class(column_family)
       @sub_column_name_class[column_family] ||= column_name_class_for_key(column_family, "CompareSubcolumnsWith")
     end
-    
+
     def column_name_class_for_key(column_family, comparator_key)
       property = column_family_property(column_family, comparator_key)
       property =~ /.*\.(.*?)$/
@@ -28,17 +28,17 @@ class Cassandra
     end
 
     def column_family_property(column_family, key)
-      @schema[column_family][key]
+      schema[column_family][key]
     rescue NoMethodError
       raise AccessError, "Invalid column family \"#{column_family}\""    
     end
-    
+
     def multi_column_to_hash!(hash)
       hash.each do |key, column_or_supercolumn|
         hash[key] = (column_or_supercolumn.column.value if column_or_supercolumn.column)
       end
     end
-    
+
     def multi_columns_to_hash!(column_family, hash)
       hash.each do |key, columns| 
         hash[key] = columns_to_hash(column_family, columns)
@@ -50,7 +50,7 @@ class Cassandra
         hash[key] = sub_columns_to_hash(column_family, sub_columns)
       end
     end
-    
+
     def columns_to_hash(column_family, columns)
       columns_to_hash_for_classes(columns, column_name_class(column_family), sub_column_name_class(column_family))
     end
@@ -58,7 +58,7 @@ class Cassandra
     def sub_columns_to_hash(column_family, columns)
       columns_to_hash_for_classes(columns, sub_column_name_class(column_family))
     end
-    
+
     def columns_to_hash_for_classes(columns, column_name_class, sub_column_name_class = nil)
       hash = OrderedHash.new
       Array(columns).each do |c|
@@ -72,30 +72,36 @@ class Cassandra
       end
       hash    
     end
-        
-    def hash_to_columns(column_family, hash, timestamp)
-      hash.map do |column, value|
-        CassandraThrift::ColumnOrSuperColumn.new(:column => 
-          CassandraThrift::Column.new(
-            :name => column_name_class(column_family).new(column).to_s, 
-            :value => value, 
-            :timestamp => timestamp))
-      end    
-    end
-    
-    def hash_to_super_columns(column_family, hash, timestamp)
-      hash.map do |column, sub_hash|
-        sub_columns = sub_hash.map do |sub_column, value|
-          CassandraThrift::Column.new(
-            :name => sub_column_name_class(column_family).new(sub_column).to_s, 
-            :value => value, 
-            :timestamp => timestamp)
-        end    
-        CassandraThrift::ColumnOrSuperColumn.new(:super_column => 
-          CassandraThrift::SuperColumn.new(
-            :name => column_name_class(column_family).new(column).to_s, 
-            :columns => sub_columns))
+
+    def hash_to_cfmap(column_family, hash, timestamp)
+      h = Hash.new
+      if is_super(column_family)
+        h[column_family] = hash.collect do |super_column_name, sub_columns|
+          CassandraThrift::ColumnOrSuperColumn.new(
+            :super_column => CassandraThrift::SuperColumn.new(
+              :name => column_name_class(column_family).new(super_column_name).to_s,
+              :columns => sub_columns.collect { |sub_column_name, sub_column_value|
+                CassandraThrift::Column.new(
+                  :name      => sub_column_name_class(column_family).new(sub_column_name).to_s,
+                  :value     => sub_column_value,
+                  :timestamp => timestamp
+                )
+              }
+            )
+          )
+        end
+      else
+        h[column_family] = hash.collect do |column_name, value|
+          CassandraThrift::ColumnOrSuperColumn.new(
+            :column => CassandraThrift::Column.new(
+              :name      => column_name_class(column_family).new(column_name).to_s,
+              :value     => value,
+              :timestamp => timestamp
+            )
+          )
+        end
       end
-    end    
+      h
+    end
   end
 end

data/lib/cassandra/protocol.rb

@@ -4,8 +4,12 @@ class Cassandra
   module Protocol #:nodoc:
     private
 
-    def _mutate(mutation, consistency)
-      @client.batch_mutate(@keyspace, mutation, consistency)
+    def _insert(key, cfmap, consistency_level)
+      @client.batch_insert(@keyspace, key, cfmap, consistency_level)
+    end
+
+    def _remove(key, column_path, timestamp, consistency_level)
+      @client.remove(@keyspace, key, column_path, timestamp, consistency_level)
     end
 
     def _count_columns(column_family, key, super_column, consistency)

data/test/cassandra_test.rb

@@ -4,13 +4,13 @@ class CassandraTest < Test::Unit::TestCase
   include Cassandra::Constants
 
   def setup
-    @twitter = Cassandra.new('Twitter', '127.0.0.1')
+    @twitter = Cassandra.new('Twitter', "127.0.0.1:9160", :retries => 2)
     @twitter.clear_keyspace!
 
-    @blogs = Cassandra.new('Multiblog', '127.0.0.1')
+    @blogs = Cassandra.new('Multiblog')
     @blogs.clear_keyspace!
 
-    @blogs_long = Cassandra.new('MultiblogLong', '127.0.0.1')
+    @blogs_long = Cassandra.new('MultiblogLong')
     @blogs_long.clear_keyspace!
 
     @uuids = (0..6).map {|i| UUID.new(Time.at(2**(24+i))) }
@@ -26,7 +26,7 @@ class CassandraTest < Test::Unit::TestCase
 
   def test_connection_reopens
     assert_raises(Thrift::ProtocolException) do
-      @twitter.send("_mutate", [], -5)
+      @twitter.send("_insert", [], -5, '')
     end
     assert_nothing_raised do
       @twitter.insert(:Statuses, key, {'body' => 'v'})
@@ -318,6 +318,12 @@ class CassandraTest < Test::Unit::TestCase
     assert_equal({}, @twitter.get(:Users, key + '1')) # Removed
   end
 
+  def test_complain_about_nil_key
+    assert_raises(ArgumentError) do
+      @twitter.insert(:Statuses, nil, {'text' => 'crap'})
+    end
+  end
+
   private
 
   def key

data/test/test_helper.rb

@@ -4,7 +4,7 @@ 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')
+  @test_client = Cassandra.new('Twitter')
 rescue Thrift::TransportException => e
   #FIXME Make server automatically start if not running
   if e.message =~ /Could not connect/

data/vendor/gen-rb/cassandra.rb

@@ -26,6 +26,7 @@ require 'cassandra_types'
             return result.success unless result.success.nil?
             raise result.ire unless result.ire.nil?
             raise result.nfe unless result.nfe.nil?
+            raise result.ue unless result.ue.nil?
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get failed: unknown result')
           end
 
@@ -43,6 +44,7 @@ require 'cassandra_types'
             return result.success unless result.success.nil?
             raise result.ire unless result.ire.nil?
             raise result.nfe unless result.nfe.nil?
+            raise result.ue unless result.ue.nil?
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_slice failed: unknown result')
           end
 
@@ -59,6 +61,7 @@ require 'cassandra_types'
             result = receive_message(Multiget_result)
             return result.success unless result.success.nil?
             raise result.ire unless result.ire.nil?
+            raise result.ue unless result.ue.nil?
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'multiget failed: unknown result')
           end
 
@@ -75,6 +78,7 @@ require 'cassandra_types'
             result = receive_message(Multiget_slice_result)
             return result.success unless result.success.nil?
             raise result.ire unless result.ire.nil?
+            raise result.ue unless result.ue.nil?
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'multiget_slice failed: unknown result')
           end
 
@@ -91,6 +95,7 @@ require 'cassandra_types'
             result = receive_message(Get_count_result)
             return result.success unless result.success.nil?
             raise result.ire unless result.ire.nil?
+            raise result.ue unless result.ue.nil?
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_count failed: unknown result')
           end
 
@@ -107,6 +112,7 @@ require 'cassandra_types'
             result = receive_message(Get_key_range_result)
             return result.success unless result.success.nil?
             raise result.ire unless result.ire.nil?
+            raise result.ue unless result.ue.nil?
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'get_key_range failed: unknown result')
           end
 
@@ -126,17 +132,17 @@ require 'cassandra_types'
             return
           end
 
-          def batch_mutate(keyspace, batch_mutations, consistency_level)
-            send_batch_mutate(keyspace, batch_mutations, consistency_level)
-            recv_batch_mutate()
+          def batch_insert(keyspace, key, cfmap, consistency_level)
+            send_batch_insert(keyspace, key, cfmap, consistency_level)
+            recv_batch_insert()
           end
 
-          def send_batch_mutate(keyspace, batch_mutations, consistency_level)
-            send_message('batch_mutate', Batch_mutate_args, :keyspace => keyspace, :batch_mutations => batch_mutations, :consistency_level => consistency_level)
+          def send_batch_insert(keyspace, key, cfmap, consistency_level)
+            send_message('batch_insert', Batch_insert_args, :keyspace => keyspace, :key => key, :cfmap => cfmap, :consistency_level => consistency_level)
           end
 
-          def recv_batch_mutate()
-            result = receive_message(Batch_mutate_result)
+          def recv_batch_insert()
+            result = receive_message(Batch_insert_result)
             raise result.ire unless result.ire.nil?
             raise result.ue unless result.ue.nil?
             return
@@ -218,6 +224,8 @@ require 'cassandra_types'
               result.ire = ire
             rescue CassandraThrift::NotFoundException => nfe
               result.nfe = nfe
+            rescue CassandraThrift::UnavailableException => ue
+              result.ue = ue
             end
             write_result(result, oprot, 'get', seqid)
           end
@@ -231,6 +239,8 @@ require 'cassandra_types'
               result.ire = ire
             rescue CassandraThrift::NotFoundException => nfe
               result.nfe = nfe
+            rescue CassandraThrift::UnavailableException => ue
+              result.ue = ue
             end
             write_result(result, oprot, 'get_slice', seqid)
           end
@@ -242,6 +252,8 @@ require 'cassandra_types'
               result.success = @handler.multiget(args.keyspace, args.keys, args.column_path, args.consistency_level)
             rescue CassandraThrift::InvalidRequestException => ire
               result.ire = ire
+            rescue CassandraThrift::UnavailableException => ue
+              result.ue = ue
             end
             write_result(result, oprot, 'multiget', seqid)
           end
@@ -253,6 +265,8 @@ require 'cassandra_types'
               result.success = @handler.multiget_slice(args.keyspace, args.keys, args.column_parent, args.predicate, args.consistency_level)
             rescue CassandraThrift::InvalidRequestException => ire
               result.ire = ire
+            rescue CassandraThrift::UnavailableException => ue
+              result.ue = ue
             end
             write_result(result, oprot, 'multiget_slice', seqid)
           end
@@ -264,6 +278,8 @@ require 'cassandra_types'
               result.success = @handler.get_count(args.keyspace, args.key, args.column_parent, args.consistency_level)
             rescue CassandraThrift::InvalidRequestException => ire
               result.ire = ire
+            rescue CassandraThrift::UnavailableException => ue
+              result.ue = ue
             end
             write_result(result, oprot, 'get_count', seqid)
           end
@@ -275,6 +291,8 @@ require 'cassandra_types'
               result.success = @handler.get_key_range(args.keyspace, args.column_family, args.start, args.finish, args.count, args.consistency_level)
             rescue CassandraThrift::InvalidRequestException => ire
               result.ire = ire
+            rescue CassandraThrift::UnavailableException => ue
+              result.ue = ue
             end
             write_result(result, oprot, 'get_key_range', seqid)
           end
@@ -292,17 +310,17 @@ require 'cassandra_types'
             write_result(result, oprot, 'insert', seqid)
           end
 
-          def process_batch_mutate(seqid, iprot, oprot)
-            args = read_args(iprot, Batch_mutate_args)
-            result = Batch_mutate_result.new()
+          def process_batch_insert(seqid, iprot, oprot)
+            args = read_args(iprot, Batch_insert_args)
+            result = Batch_insert_result.new()
             begin
-              @handler.batch_mutate(args.keyspace, args.batch_mutations, args.consistency_level)
+              @handler.batch_insert(args.keyspace, args.key, args.cfmap, args.consistency_level)
             rescue CassandraThrift::InvalidRequestException => ire
               result.ire = ire
             rescue CassandraThrift::UnavailableException => ue
               result.ue = ue
             end
-            write_result(result, oprot, 'batch_mutate', seqid)
+            write_result(result, oprot, 'batch_insert', seqid)
           end
 
           def process_remove(seqid, iprot, oprot)
@@ -377,12 +395,14 @@ require 'cassandra_types'
           SUCCESS = 0
           IRE = 1
           NFE = 2
+          UE = 3
 
-          ::Thrift::Struct.field_accessor self, :success, :ire, :nfe
+          ::Thrift::Struct.field_accessor self, :success, :ire, :nfe, :ue
           FIELDS = {
             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}
+            NFE => {:type => ::Thrift::Types::STRUCT, :name => 'nfe', :class => CassandraThrift::NotFoundException},
+            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException}
           }
 
           def struct_fields; FIELDS; end
@@ -424,12 +444,14 @@ require 'cassandra_types'
           SUCCESS = 0
           IRE = 1
           NFE = 2
+          UE = 3
 
-          ::Thrift::Struct.field_accessor self, :success, :ire, :nfe
+          ::Thrift::Struct.field_accessor self, :success, :ire, :nfe, :ue
           FIELDS = {
             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}
+            NFE => {:type => ::Thrift::Types::STRUCT, :name => 'nfe', :class => CassandraThrift::NotFoundException},
+            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException}
           }
 
           def struct_fields; FIELDS; end
@@ -468,11 +490,13 @@ require 'cassandra_types'
           include ::Thrift::Struct
           SUCCESS = 0
           IRE = 1
+          UE = 2
 
-          ::Thrift::Struct.field_accessor self, :success, :ire
+          ::Thrift::Struct.field_accessor self, :success, :ire, :ue
           FIELDS = {
             SUCCESS => {:type => ::Thrift::Types::MAP, :name => 'success', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRUCT, :class => CassandraThrift::ColumnOrSuperColumn}},
-            IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException}
+            IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException},
+            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException}
           }
 
           def struct_fields; FIELDS; end
@@ -513,11 +537,13 @@ require 'cassandra_types'
           include ::Thrift::Struct
           SUCCESS = 0
           IRE = 1
+          UE = 2
 
-          ::Thrift::Struct.field_accessor self, :success, :ire
+          ::Thrift::Struct.field_accessor self, :success, :ire, :ue
           FIELDS = {
             SUCCESS => {:type => ::Thrift::Types::MAP, :name => 'success', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::LIST, :element => {:type => ::Thrift::Types::STRUCT, :class => CassandraThrift::ColumnOrSuperColumn}}},
-            IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException}
+            IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException},
+            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException}
           }
 
           def struct_fields; FIELDS; end
@@ -532,7 +558,7 @@ require 'cassandra_types'
           KEYSPACE = 1
           KEY = 2
           COLUMN_PARENT = 3
-          CONSISTENCY_LEVEL = 5
+          CONSISTENCY_LEVEL = 4
 
           ::Thrift::Struct.field_accessor self, :keyspace, :key, :column_parent, :consistency_level
           FIELDS = {
@@ -556,11 +582,13 @@ require 'cassandra_types'
           include ::Thrift::Struct
           SUCCESS = 0
           IRE = 1
+          UE = 2
 
-          ::Thrift::Struct.field_accessor self, :success, :ire
+          ::Thrift::Struct.field_accessor self, :success, :ire, :ue
           FIELDS = {
             SUCCESS => {:type => ::Thrift::Types::I32, :name => 'success'},
-            IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException}
+            IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException},
+            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException}
           }
 
           def struct_fields; FIELDS; end
@@ -603,11 +631,13 @@ require 'cassandra_types'
           include ::Thrift::Struct
           SUCCESS = 0
           IRE = 1
+          UE = 2
 
-          ::Thrift::Struct.field_accessor self, :success, :ire
+          ::Thrift::Struct.field_accessor self, :success, :ire, :ue
           FIELDS = {
             SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRING}},
-            IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException}
+            IRE => {:type => ::Thrift::Types::STRUCT, :name => 'ire', :class => CassandraThrift::InvalidRequestException},
+            UE => {:type => ::Thrift::Types::STRUCT, :name => 'ue', :class => CassandraThrift::UnavailableException}
           }
 
           def struct_fields; FIELDS; end
@@ -664,16 +694,18 @@ require 'cassandra_types'
 
         end
 
-        class Batch_mutate_args
+        class Batch_insert_args
           include ::Thrift::Struct
           KEYSPACE = 1
-          BATCH_MUTATIONS = 2
-          CONSISTENCY_LEVEL = 3
+          KEY = 2
+          CFMAP = 3
+          CONSISTENCY_LEVEL = 4
 
-          ::Thrift::Struct.field_accessor self, :keyspace, :batch_mutations, :consistency_level
+          ::Thrift::Struct.field_accessor self, :keyspace, :key, :cfmap, :consistency_level
           FIELDS = {
             KEYSPACE => {:type => ::Thrift::Types::STRING, :name => 'keyspace'},
-            BATCH_MUTATIONS => {:type => ::Thrift::Types::LIST, :name => 'batch_mutations', :element => {:type => ::Thrift::Types::STRUCT, :class => CassandraThrift::BatchMutation}},
+            KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
+            CFMAP => {:type => ::Thrift::Types::MAP, :name => 'cfmap', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::LIST, :element => {:type => ::Thrift::Types::STRUCT, :class => CassandraThrift::ColumnOrSuperColumn}}},
             CONSISTENCY_LEVEL => {:type => ::Thrift::Types::I32, :name => 'consistency_level', :default =>             0, :enum_class => CassandraThrift::ConsistencyLevel}
           }
 
@@ -687,7 +719,7 @@ require 'cassandra_types'
 
         end
 
-        class Batch_mutate_result
+        class Batch_insert_result
           include ::Thrift::Struct
           IRE = 1
           UE = 2

data/vendor/gen-rb/cassandra_types.rb

@@ -152,14 +152,12 @@ module CassandraThrift
       COLUMN_FAMILY = 3
       SUPER_COLUMN = 4
       COLUMN = 5
-      TIMESTAMP = 6
 
-      ::Thrift::Struct.field_accessor self, :column_family, :super_column, :column, :timestamp
+      ::Thrift::Struct.field_accessor self, :column_family, :super_column, :column
       FIELDS = {
         COLUMN_FAMILY => {:type => ::Thrift::Types::STRING, :name => 'column_family'},
         SUPER_COLUMN => {:type => ::Thrift::Types::STRING, :name => 'super_column', :optional => true},
-        COLUMN => {:type => ::Thrift::Types::STRING, :name => 'column', :optional => true},
-        TIMESTAMP => {:type => ::Thrift::Types::I64, :name => 'timestamp', :optional => true}
+        COLUMN => {:type => ::Thrift::Types::STRING, :name => 'column', :optional => true}
       }
 
       def struct_fields; FIELDS; end
@@ -214,25 +212,4 @@ module CassandraThrift
 
     end
 
-    class BatchMutation
-      include ::Thrift::Struct
-      KEY = 1
-      CFMAP = 2
-      COLUMN_PATHS = 3
-
-      ::Thrift::Struct.field_accessor self, :key, :cfmap, :column_paths
-      FIELDS = {
-        KEY => {:type => ::Thrift::Types::STRING, :name => 'key'},
-        CFMAP => {:type => ::Thrift::Types::MAP, :name => 'cfmap', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::LIST, :element => {:type => ::Thrift::Types::STRUCT, :class => CassandraThrift::ColumnOrSuperColumn}}, :optional => true},
-        COLUMN_PATHS => {:type => ::Thrift::Types::LIST, :name => 'column_paths', :element => {:type => ::Thrift::Types::STRUCT, :class => CassandraThrift::ColumnPath}, :optional => true}
-      }
-
-      def struct_fields; FIELDS; end
-
-      def validate
-        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field key is unset!') unless @key
-      end
-
-    end
-
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cassandra
 version: !ruby/object:Gem::Version 
-  version: 0.5.6.2
+  version: "0.6"
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,11 +30,11 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2009-09-01 00:00:00 -07:00
+date: 2009-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thrift
+  name: thrift_client
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -74,7 +74,6 @@ extra_rdoc_files:
 - lib/cassandra/long.rb
 - lib/cassandra/ordered_hash.rb
 - lib/cassandra/protocol.rb
-- lib/cassandra/safe_client.rb
 - lib/cassandra/time.rb
 - lib/cassandra/uuid.rb
 files: 
@@ -97,7 +96,6 @@ files:
 - lib/cassandra/long.rb
 - lib/cassandra/ordered_hash.rb
 - lib/cassandra/protocol.rb
-- lib/cassandra/safe_client.rb
 - lib/cassandra/time.rb
 - lib/cassandra/uuid.rb
 - test/cassandra_test.rb
@@ -136,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A Ruby client for the Cassandra distributed database.

data/lib/cassandra/safe_client.rb

@@ -1,26 +0,0 @@
-
-module CassandraThrift #:nodoc: all
-  module Cassandra
-  
-    class SafeClient  
-      def initialize(client, transport, reset = false)
-        @client = client 
-        @transport = transport
-        @reset = reset
-      end
-      
-      def reset_transport
-        @transport.close rescue nil
-        @transport.open
-      end
-      
-      def method_missing(*args)
-        reset_transport if @reset
-        @client.send(*args)
-      rescue IOError, UnavailableException, Thrift::ProtocolException, Thrift::ApplicationException, Thrift::TransportException
-        reset_transport
-        @client.send(*args)
-      end
-    end
-  end
-end