cassandra 0.8.1 → 0.8.2

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.8.2 Renamed :thrift_client_class option, UUID fix, 0.6 update, fixing cassanda install, much Mock fixes
+
 v0.8.1 Adding the ability to compose ThriftClient classes.
 
 v0.8.0 Compatibility with Cassandra 0.6 betas (no longer compatible with 0.5); assorted bugfixes.

data/Rakefile

@@ -17,7 +17,7 @@ end
 
 CASSANDRA_HOME = ENV['CASSANDRA_HOME'] || "#{ENV['HOME']}/cassandra"
 DOWNLOAD_DIR = "/tmp"
-DIST_URL = "http://apache.osuosl.org/incubator/cassandra/0.6.0/apache-cassandra-0.6.0-beta2-bin.tar.gz"
+DIST_URL = "http://mirrors.kahuki.com/apache/cassandra/0.6.0/apache-cassandra-0.6.0-rc1-bin.tar.gz"
 DIST_FILE = DIST_URL.split('/').last
 
 directory CASSANDRA_HOME
@@ -39,11 +39,8 @@ end
 
 file File.join(CASSANDRA_HOME, 'server') => File.join(DOWNLOAD_DIR, DIST_FILE) do
   Dir.chdir(CASSANDRA_HOME) do
-    sh "tar xzf #{DIST_FILE}"
+    sh "tar xzf #{File.join(DOWNLOAD_DIR, DIST_FILE)} -C #{CASSANDRA_HOME}"
     sh "mv #{DIST_FILE.split('.')[0..2].join('.').sub('-bin', '')} server"
-    Dir.chdir('server') do
-      sh "ant ivy-retrieve"
-    end
   end
 end
 

data/cassandra.gemspec

@@ -2,12 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra}
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver, Ryan King"]
-  s.cert_chain = ["/Users/ryan/.gemkeys/gem-public_cert.pem"]
-  s.date = %q{2010-03-30}
+  s.date = %q{2010-04-13}
   s.default_executable = %q{cassandra_helper}
   s.description = %q{A Ruby client for the Cassandra distributed database.}
   s.email = %q{}
@@ -18,8 +17,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cassandra", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fauna}
-  s.rubygems_version = %q{1.3.5}
-  s.signing_key = %q{/Users/ryan/.gemkeys/gem-private_key.pem}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A Ruby client for the Cassandra distributed database.}
   s.test_files = ["test/cassandra_client_test.rb", "test/cassandra_mock_test.rb", "test/cassandra_test.rb", "test/comparable_types_test.rb", "test/eventmachine_test.rb", "test/ordered_hash_test.rb", "test/test_helper.rb"]
 

data/conf/storage-conf.xml

@@ -64,6 +64,7 @@
         <ColumnFamily CompareWith="UTF8Type" Name="StatusAudits" />
         <ColumnFamily CompareWith="UTF8Type" CompareSubcolumnsWith="TimeUUIDType" ColumnType="Super" Name="StatusRelationships" />  
         <ColumnFamily CompareWith="UTF8Type" ColumnType="Super" Name="Index" />
+        <ColumnFamily CompareWith="BytesType" ColumnType="Standard" Name="TimelinishThings" />
 
         <ReplicaPlacementStrategy>org.apache.cassandra.locator.RackUnawareStrategy</ReplicaPlacementStrategy>
         <ReplicationFactor>1</ReplicationFactor>
@@ -154,12 +155,12 @@
    ~ disk.  Keep the data disks and the CommitLog disks separate for best
    ~ performance
   -->
-  <CommitLogDirectory>/var/lib/cassandra/commitlog</CommitLogDirectory>
+  <CommitLogDirectory>data/cassandra/commitlog</CommitLogDirectory>
   <DataFileDirectories>
-      <DataFileDirectory>/var/lib/cassandra/data</DataFileDirectory>
+      <DataFileDirectory>data/cassandra/data</DataFileDirectory>
   </DataFileDirectories>
-  <CalloutLocation>/var/lib/cassandra/callouts</CalloutLocation>
-  <StagingFileDirectory>/var/lib/cassandra/staging</StagingFileDirectory>
+  <CalloutLocation>data/cassandra/callouts</CalloutLocation>
+  <StagingFileDirectory>data/cassandra/staging</StagingFileDirectory>
 
 
   <!--

data/lib/cassandra.rb

@@ -2,7 +2,6 @@ require 'rubygems'
 require 'thrift_client'
 require 'json' unless defined?(JSON)
 require 'simple_uuid'
-include SimpleUUID
 here = File.expand_path(File.dirname(__FILE__))
 
 $LOAD_PATH << "#{here}/../vendor/gen-rb"

data/lib/cassandra/cassandra.rb

@@ -6,7 +6,7 @@ Create a new Cassandra client instance. Accepts a keyspace name, and optional ho
 
 You can then make calls to the server via the <tt>client</tt> instance.
 
-  client.insert(:UserRelationships, "5", {"user_timeline" => {UUID.new => "1"}})
+  client.insert(:UserRelationships, "5", {"user_timeline" => {SimpleUUID::UUID.new => "1"}})
   client.get(:UserRelationships, "5", "user_timeline")
 
 For read methods, valid option parameters are:
@@ -66,12 +66,17 @@ class Cassandra
     @is_super = {}
     @column_name_class = {}
     @sub_column_name_class = {}
+    @auto_discover_nodes = true
     @thrift_client_options = THRIFT_DEFAULTS.merge(thrift_client_options)
     @thrift_client_class = @thrift_client_options[:thrift_client_class]
     @keyspace = keyspace
     @servers = Array(servers)
   end
 
+  def disable_node_auto_discovery!
+    @auto_discover_nodes = false
+  end
+
   def disconnect!
     @client.disconnect!
     @client = nil
@@ -293,9 +298,13 @@ class Cassandra
   end
 
   def all_nodes
-    ips = ::JSON.parse(new_client.get_string_property('token map')).values
-    port = @servers.first.split(':').last
-    ips.map{|ip| "#{ip}:#{port}" }
+    if @auto_discover_nodes
+      ips = ::JSON.parse(new_client.get_string_property('token map')).values
+      port = @servers.first.split(':').last
+      ips.map{|ip| "#{ip}:#{port}" }
+    else
+      @servers
+    end
   end
 
 end

data/lib/cassandra/columns.rb

@@ -21,7 +21,7 @@ class Cassandra
       property =~ /.*\.(.*?)$/
       case $1
       when "LongType" then Long
-      when "LexicalUUIDType", "TimeUUIDType" then UUID
+      when "LexicalUUIDType", "TimeUUIDType" then SimpleUUID::UUID
       else 
         String # UTF8, Ascii, Bytes, anything else
       end

data/lib/cassandra/constants.rb

@@ -5,7 +5,6 @@ class Cassandra
   module Constants
     include Cassandra::Consistency
         
-    UUID = Cassandra::UUID
     Long = Cassandra::Long
     OrderedHash = Cassandra::OrderedHash
   end

data/lib/cassandra/helpers.rb

@@ -5,13 +5,13 @@ class Cassandra
       column_family = column_family.to_s
       # Keys
       [keys].flatten.each do |key|
-        raise ArgumentError, "Key #{key.inspect} must be a String for #{calling_method}" unless key.is_a?(String)
+        raise ArgumentError, "Key #{key.inspect} must be a String for #{caller[2].inspect}." unless key.is_a?(String)
       end
 
       # Options
       if args.last.is_a?(Hash)
         extras = args.last.keys - options.keys
-        raise ArgumentError, "Invalid options #{extras.inspect[1..-2]} for #{calling_method}" if extras.any?
+        raise ArgumentError, "Invalid options #{extras.inspect[1..-2]} for #{caller[1]}" if extras.any?
         options.merge!(args.pop)      
       end
 

data/lib/cassandra/mock.rb

@@ -1,6 +1,6 @@
 require 'nokogiri'
 
-class UUID
+class SimpleUUID::UUID
   def >=(other)
     (self <=> other) >= 0
   end
@@ -34,35 +34,31 @@ class Cassandra
       @data[column_family.to_sym] = OrderedHash.new
     end
 
-    def insert(column_family, key, hash, options = {})
+    def insert(column_family, key, hash_or_array, options = {})
       if @batch
-        @batch << [:insert, column_family, key, hash, options]
+        @batch << [:insert, column_family, key, hash_or_array, options]
       else
         raise ArgumentError if key.nil?
         if column_family_type(column_family) == 'Standard'
-          insert_standard(column_family, key, hash)
+          insert_standard(column_family, key, hash_or_array)
         else
-          insert_super(column_family, key, hash)
+          insert_super(column_family, key, hash_or_array)
         end
       end
     end
 
-    def insert_standard(column_family, key, hash)
-      if cf(column_family)[key]
-        cf(column_family)[key] = merge_and_sort(cf(column_family)[key], hash)
-      else
-        cf(column_family)[key] = OrderedHash[hash.sort{|a,b| a[0] <=> b[0]}]
-      end
+    def insert_standard(column_family, key, hash_or_array)
+      old = cf(column_family)[key] || OrderedHash.new
+      cf(column_family)[key] = merge_and_sort(old, hash_or_array)
     end
 
     def insert_super(column_family, key, hash)
+      raise ArgumentError unless hash.is_a?(Hash)
       cf(column_family)[key] ||= OrderedHash.new
+
       hash.keys.each do |sub_key|
-        if cf(column_family)[key][sub_key]
-          cf(column_family)[key][sub_key] = merge_and_sort(cf(column_family)[key][sub_key], hash[sub_key])
-        else
-          cf(column_family)[key][sub_key] = OrderedHash[hash[sub_key].sort{|a,b| a[0] <=> b[0]}]
-        end
+        old = cf(column_family)[key][sub_key] || OrderedHash.new
+        cf(column_family)[key][sub_key] = merge_and_sort(old, hash[sub_key])
       end
     end
 
@@ -244,7 +240,7 @@ class Cassandra
         if cf['CompareWith']
           ret[cf['Name']]['CompareWith'] = 'org.apache.cassandra.db.marshal.' + cf['CompareWith']
         end
-        if cf['ColumnType']
+        if cf['ColumnType'] == 'Super'
           ret[cf['Name']]['Type'] = 'Super'
         else
           ret[cf['Name']]['Type'] = 'Standard'
@@ -283,15 +279,14 @@ class Cassandra
       end
 
       case klass
-      when "org.apache.cassandra.db.marshal.UTF8Type"
+      when "org.apache.cassandra.db.marshal.UTF8Type", "org.apache.cassandra.db.marshal.BytesType"
         column_name
       when "org.apache.cassandra.db.marshal.TimeUUIDType"
-        UUID.new(column_name)
+        SimpleUUID::UUID.new(column_name)
       when "org.apache.cassandra.db.marshal.LongType"
         Long.new(column_name)
       else
-        p klass
-        raise
+        raise "Unknown column family type: #{klass.inspect}"
       end
     end
 
@@ -304,6 +299,9 @@ class Cassandra
     end
 
     def merge_and_sort(old_stuff, new_stuff)
+      if new_stuff.is_a?(Array)
+        new_stuff = new_stuff.inject({}){|h,k| h[k] = nil; h }
+      end
       OrderedHash[old_stuff.merge(new_stuff).sort{|a,b| a[0] <=> b[0]}]
     end
 
@@ -321,4 +319,4 @@ class Cassandra
       end
     end
   end
-end
+end

data/test/cassandra_mock_test.rb

@@ -16,7 +16,7 @@ class CassandraMockTest < CassandraTest
     @blogs_long = Cassandra::Mock.new('MultiblogLong', storage_xml_path)
     @blogs_long.clear_keyspace!
 
-    @uuids = (0..6).map {|i| UUID.new(Time.at(2**(24+i))) }
+    @uuids = (0..6).map {|i| SimpleUUID::UUID.new(Time.at(2**(24+i))) }
     @longs = (0..6).map {|i| Long.new(Time.at(2**(24+i))) }
   end
 
@@ -45,7 +45,9 @@ class CassandraMockTest < CassandraTest
       "UserAudits"=>{
         "CompareWith"=>"org.apache.cassandra.db.marshal.UTF8Type", 
         "Type"=>"Standard"},
-      "Users"=>{"CompareWith"=>"org.apache.cassandra.db.marshal.UTF8Type", "Type"=>"Standard"}
+      "Users"=>{"CompareWith"=>"org.apache.cassandra.db.marshal.UTF8Type", "Type"=>"Standard"},
+      "TimelinishThings"=>
+        {"CompareWith"=>"org.apache.cassandra.db.marshal.BytesType", "Type"=>"Standard"}
     }
     stuff = @twitter.send(:schema_for_keyspace, 'Twitter')
     data.keys.each do |k|
@@ -58,4 +60,14 @@ class CassandraMockTest < CassandraTest
     @twitter.insert(:Statuses, 'a', {:text => 'foo'})
     assert_equal ['a'], @twitter.get_range(:Statuses, :count => 1)
   end
+
+  def test_inserting_array_for_indices
+    @twitter.insert(:TimelinishThings, 'a', ['1','2'])
+    row = @twitter.get(:TimelinishThings, 'a')
+    assert_equal({'1' => nil, '2' => nil}, row)
+
+    assert_raises(ArgumentError) {
+      @twitter.insert(:UserRelationships, 'a', ['u1','u2'])
+    }
+  end
 end

data/test/cassandra_test.rb

@@ -13,7 +13,7 @@ class CassandraTest < Test::Unit::TestCase
     @blogs_long = Cassandra.new('MultiblogLong')
     @blogs_long.clear_keyspace!
 
-    @uuids = (0..6).map {|i| UUID.new(Time.at(2**(24+i))) }
+    @uuids = (0..6).map {|i| SimpleUUID::UUID.new(Time.at(2**(24+i))) }
     @longs = (0..6).map {|i| Long.new(Time.at(2**(24+i))) }
   end
 

metadata

@@ -1,78 +1,74 @@
 --- !ruby/object:Gem::Specification 
 name: cassandra
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  prerelease: false
+  segments: 
+  - 0
+  - 8
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Evan Weaver, Ryan King
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  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-----
+cert_chain: []
 
-date: 2010-03-30 00:00:00 -07:00
+date: 2010-04-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thrift_client
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 0
         version: 0.4.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: simple_uuid
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 0
         version: 0.1.0
-    version: 
+  type: :runtime
+  version_requirements: *id004
 description: A Ruby client for the Cassandra distributed database.
 email: ""
 executables: 
@@ -148,18 +144,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      - 8
       version: "0.8"
-  version: 
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A Ruby client for the Cassandra distributed database.