cassandra 0.6 → 0.7

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.7 Various improvements. 
+- Compatibility with Cassandra 0.5.
+- performance improvements
 
 v0.6. Use thrift_client gem.
 

data/README

@@ -1,4 +1,3 @@
-
 cassandra
 
 A Ruby client for the Cassandra distributed database. 
@@ -37,7 +36,7 @@ Now, start IRb and require the library:
   
 Connect to a server and keyspace:
   
-  client = Cassandra.new('Twitter', "127.0.0.1")
+  client = Cassandra.new('Twitter', '127.0.0.1:9160')
   
 Insert into a column family. You can insert a Cassandra::OrderedHash, or a regular Hash, if order doesn't matter:
 

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_client', 'rake']
+    p.dependencies = ['thrift_client', 'json', '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,7 +16,7 @@ unless ENV['FROM_BIN_CASSANDRA_HELPER']
   end
 end
 
-REVISION = "c1fa17c0e359fa032bdb2d6b5f63120359ff881f"
+REVISION = "c4cc3505855c157a0887611cd9abe6f996bde345"
 
 PATCHES = []
 
@@ -35,7 +35,7 @@ task :cassandra => [:build_cassandra, CASSANDRA_TEST] do
   if !ENV["CASSANDRA_INCLUDE"]
     env << "CASSANDRA_INCLUDE=#{Dir.pwd}/conf/cassandra.in.sh "
     env << "CASSANDRA_HOME=#{CASSANDRA_HOME} "
-    env << "CASSANDRA_CONF=#{File.expand_path(File.dirname(__FILE__))}/conf"
+    env << "CASSANDRA_CONF=#{Dir.pwd}/conf"
   end
   # Start server
   Dir.chdir(CASSANDRA_TEST) do

data/cassandra.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra}
-  s.version = "0.6"
+  s.version = "0.7"
 
   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-11-18}
+  s.cert_chain = ["/Users/ryan/.gemkeys/gem-public_cert.pem"]
+  s.date = %q{2010-01-08}
   s.default_executable = %q{cassandra_helper}
   s.description = %q{A Ruby client for the Cassandra distributed database.}
   s.email = %q{}
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fauna}
   s.rubygems_version = %q{1.3.5}
-  s.signing_key = %q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-private_key.pem}
+  s.signing_key = %q{/Users/ryan/.gemkeys/gem-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"]
 
@@ -29,13 +29,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<thrift_client>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<rake>, [">= 0"])
     else
       s.add_dependency(%q<thrift_client>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
     end
   else
     s.add_dependency(%q<thrift_client>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
   end
 end

data/lib/cassandra.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'thrift_client'
+require 'json'
 
 here = File.expand_path(File.dirname(__FILE__))
 

data/lib/cassandra/cassandra.rb

@@ -37,10 +37,8 @@ class Cassandra
     include CassandraThrift::ConsistencyLevel
   end
 
-  MAX_INT = 2**31 - 1
-
   WRITE_DEFAULTS = {
-    :count => MAX_INT,
+    :count => 1000,
     :timestamp => nil,
     :consistency => Consistency::ONE
   }.freeze
@@ -72,13 +70,18 @@ class Cassandra
 
 
   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
+    return @client if defined?(@client)
+    client!
+  end
+
+  def client!
+    @client = raw_client
+    unless (keyspaces = client.get_string_list_property("keyspaces")).include?(@keyspace)
+      raise AccessError, "Keyspace #{@keyspace.inspect} not found. Available: #{keyspaces.inspect}"
     end
+    @servers = all_nodes
+    @client.disconnect!
+    @client = raw_client
   end
 
   def keyspaces
@@ -128,7 +131,9 @@ class Cassandra
   # FIXME May not currently delete all records without multiple calls. Waiting
   # for ranged remove support in Cassandra.
   def clear_column_family!(column_family, options = {})
-    get_range(column_family).each { |key| remove(column_family, key, options) }
+    while (keys = get_range(column_family, :count => 100)).length > 0
+      keys.each { |key| remove(column_family, key, options) }
+    end
   end
 
   # Remove all rows in the keyspace. Supports options <tt>:consistency</tt> and
@@ -214,9 +219,15 @@ class Cassandra
   # Count all rows in the column_family you request. Requires the table
   # to be partitioned with OrderPreservingHash. Supports the <tt>:start</tt>,
   # <tt>:finish</tt>, and <tt>:consistency</tt> options.
-  # FIXME will count only MAX_INT records
   def count_range(column_family, options = {})
-    get_range(column_family, options.merge(:count => MAX_INT)).size
+    count = 0
+    l = []
+    start_key = ''
+    while (l = get_range(column_family, options.merge(:count => 1000, :start => start_key))).size > 0
+      count += l.size
+      start_key = l.last.succ
+    end
+    count
   end
 
   # Open a batch operation and yield. Inserts and deletes will be queued until
@@ -298,4 +309,14 @@ class Cassandra
       @schema ||= client.describe_keyspace(@keyspace)
     end
   end
+
+  def raw_client
+    ThriftClient.new(CassandraThrift::Cassandra::Client, @servers, @thrift_client_options)
+  end
+
+  def all_nodes
+    ips = ::JSON.parse(@client.get_string_property('token map')).values
+    port = @servers.first.split(':').last
+    ips.map{|ip| "#{ip}:#{port}" }
+  end
 end

data/lib/cassandra/comparable.rb

@@ -18,7 +18,7 @@ class Cassandra
     end    
     
     def ==(other)
-      self.to_i == other.to_i
+      other.respond_to?(:to_i) && self.to_i == other.to_i
     end
     
     def to_s

data/lib/cassandra/protocol.rb

@@ -38,7 +38,7 @@ class Cassandra
           CassandraThrift::SlicePredicate.new(:column_names => columns),
           consistency))
       end
-      sub_columns || columns.map { |name| result[name] }
+      (sub_columns || columns).map { |name| result[name] }
     end
 
     def _multiget(column_family, keys, column, sub_column, count, start, finish, reversed, consistency)

data/lib/cassandra/uuid.rb

@@ -91,6 +91,10 @@ class Cassandra
       total_usecs <=> other.send(:total_usecs)
     end
 
+    def ==(other)
+      to_s == other.to_s
+    end
+
     def inspect(long = false)
       "<Cassandra::UUID##{object_id} time: #{
         Time.at(seconds).inspect

data/test/cassandra_test.rb

@@ -24,15 +24,6 @@ class CassandraTest < Test::Unit::TestCase
     end
   end
 
-  def test_connection_reopens
-    assert_raises(Thrift::ProtocolException) do
-      @twitter.send("_insert", [], -5, '')
-    end
-    assert_nothing_raised do
-      @twitter.insert(:Statuses, key, {'body' => 'v'})
-    end
-  end
-
   def test_get_key
     @twitter.insert(:Users, key, {'body' => 'v', 'user' => 'v'})
     assert_equal({'body' => 'v', 'user' => 'v'}, @twitter.get(:Users, key))
@@ -324,6 +315,13 @@ class CassandraTest < Test::Unit::TestCase
     end
   end
 
+  def test_raise_access_error_on_nonexistent_keyspace
+    nonexistent = Cassandra.new('Nonexistent')
+    assert_raises(Cassandra::AccessError) do
+      nonexistent.get "foo", "bar"
+    end
+  end
+
   private
 
   def key

data/test/comparable_types_test.rb

@@ -43,4 +43,9 @@ class ComparableTypesTest < Test::Unit::TestCase
       UUID.new("bogus")
     end
   end
+  
+  def test_types_behave_well
+    assert !(UUID.new() == false)
+    assert !(Long.new() == false)
+  end
 end

data/vendor/gen-rb/cassandra.rb

@@ -100,6 +100,7 @@ require 'cassandra_types'
           end
 
           def get_key_range(keyspace, column_family, start, finish, count, consistency_level)
+
             send_get_key_range(keyspace, column_family, start, finish, count, consistency_level)
             return recv_get_key_range()
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cassandra
 version: !ruby/object:Gem::Version 
-  version: "0.6"
+  version: "0.7"
 platform: ruby
 authors: 
 - Evan Weaver
@@ -10,27 +10,27 @@ bindir: bin
 cert_chain: 
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDLjCCAhagAwIBAgIBADANBgkqhkiG9w0BAQUFADA9MQ0wCwYDVQQDDARldmFu
-  MRgwFgYKCZImiZPyLGQBGRYIY2xvdWRidXIxEjAQBgoJkiaJk/IsZAEZFgJzdDAe
-  Fw0wNzA5MTYxMDMzMDBaFw0wODA5MTUxMDMzMDBaMD0xDTALBgNVBAMMBGV2YW4x
-  GDAWBgoJkiaJk/IsZAEZFghjbG91ZGJ1cjESMBAGCgmSJomT8ixkARkWAnN0MIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5C0Io89nyApnr+PvbNFge9Vs
-  yRWAlGBUEMahpXp28VrrfXZT0rAW7JBo4PlCE3jl4nE4dzE6gAdItSycjTosrw7A
-  Ir5+xoyl4Vb35adv56TIQQXvNz+BzlqnkAY5JN0CSBRTQb6mxS3hFyD/h4qgDosj
-  R2RFVzHqSxCS8xq4Ny8uzOwOi+Xyu4w67fI5JvnPvMxqrlR1eaIQHmxnf76RzC46
-  QO5QhufjAYGGXd960XzbQsQyTDUYJzrvT7AdOfiyZzKQykKt8dEpDn+QPjFTnGnT
-  QmgJBX5WJN0lHF2l1sbv3gh4Kn1tZu+kTUqeXY6ShAoDTyvZRiFqQdwh8w2lTQID
-  AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU+WqJz3xQ
-  XSea1hRvvHWcIMgeeC4wDQYJKoZIhvcNAQEFBQADggEBAGLZ75jfOEW8Nsl26CTt
-  JFrWxQTcQT/UljeefVE3xYr7lc9oQjbqO3FOyued3qW7TaNEtZfSHoYeUSMYbpw1
-  XAwocIPuSRFDGM4B+hgQGVDx8PMGiJKom4qLXjO40UZsR7QyN/u869Vj45LURm6h
-  MBcPeqCASI+WNprj9+uZa2kmHiitrFqqfMBNlm5IFbn9XeYSta9AHVvs5QQqV2m5
-  hIPfLqCyxsn/YgOGvo6iwyQTWyTswamaAC3HRWZxIS1sfn/Ssqa7E7oQMkv5FAXr
-  x5rKePfXINf8XTJczkl9OBEYdE9aNdJsJpXD0asLgGVwBICS5Bjohp6mizJcDC1+
-  yZ0=
+  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMQ0wCwYDVQQDDARyeWFu
+  MRswGQYKCZImiZPyLGQBGRYLdGhlcnlhbmtpbmcxEzARBgoJkiaJk/IsZAEZFgNj
+  b20wHhcNMTAwMTA4MTc1MDM0WhcNMTEwMTA4MTc1MDM0WjBBMQ0wCwYDVQQDDARy
+  eWFuMRswGQYKCZImiZPyLGQBGRYLdGhlcnlhbmtpbmcxEzARBgoJkiaJk/IsZAEZ
+  FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLPp+0PtRT3qCI
+  02sMsADSn7Uf1GpyXUtk4Fb94LqUO6Scl91YDmbFMpjzrQwQvBYMIVreWcwSish6
+  nip6WEk9lqXcOeDmex/qY2/FVXG8ffqjFHiNiN9vpWrWj5VMICequ+ftzWLKsPIS
+  DGJ4o+Z6wEYRuirgaRPCYAUDPglsaqctJ56wPuycryMe5+ApSkOS9iLWMprQKEAq
+  j2R2OBV0dSARdbtzuKwrP7sLDo7uPa0egFBUlcZ+nujGr4LvmpryB8scNRNmZK1w
+  1rEI7O06CbULj08qYxEhnKmFE7LbBoN/HrmvZLVQK5mWuiZQhtmJuhBfStJsaDux
+  5tBEkYZVAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBSnLarDEo5eBE2arSMrBdOOhtrnPTANBgkqhkiG9w0BAQUFAAOCAQEANER07s4K
+  Pvc1DSduliRDMUax/VSfLzDTtTAQwuSAPDrWAYXKugcJtOZOXjDbGL7c5zoWmy9u
+  Fn5vEVdm/93J+84D/IMaaof3BwX/NNEYH01CeZEIGMfc5AFFha7dabzP/uiPpb/c
+  GSvomC9IzyN37+eWwOS16cC+5XnBT6KRCaXYg2Fh6WpTgde67OVgXr4Q58HXlaZ+
+  /2BB3wq9lZ4JskvlpYpYnlPAUyiyc6R2Mjts1pURz5nkW4SuS7Kd1KCOOyr1McDH
+  VP12sTSjJclmI17BjDGQpAF0n9v5ExhJxWpeOjeBUPQsOin3ypEM1KkckLmOKvH6
+  zyKMYVRO0z/58g==
   -----END CERTIFICATE-----
 
-date: 2009-11-18 00:00:00 -08:00
+date: 2010-01-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,6 +43,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rake
   type: :runtime