cassandra 0.7.5 → 0.7.6

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.7.6 Bugfixes.
+
 v0.7.5 Another packaging error.
 
 v0.7.4 Fix thrift_client dependency

data/Rakefile

@@ -15,33 +15,40 @@ unless ENV['FROM_BIN_CASSANDRA_HELPER']
   end
 end
 
-REVISION = "298a0e66ba66c5d2a1e5d4a70f2f619ae3fbf72a"
+CASSANDRA_HOME = "#{ENV['HOME']}/cassandra"
+DIST_URL = "http://github.com/downloads/ryanking/cassandra/apache-cassandra-incubating-0.5.0.2010-02-21-bin.tar.gz"
+DIST_FILE = DIST_URL.split('/').last
 
-PATCHES = []
-
-CASSANDRA_HOME = "#{ENV['HOME']}/cassandra/server"
-
-CASSANDRA_TEST = "#{ENV['HOME']}/cassandra/test"
-
-GIT_REPO = "git://github.com/ryanking/cassandra.git"
-
-directory CASSANDRA_TEST
+directory CASSANDRA_HOME
+directory File.join(CASSANDRA_HOME, 'test', 'data')
 
 desc "Start Cassandra"
-task :cassandra => [:build_cassandra, CASSANDRA_TEST] do
-  # Construct environment
+task :cassandra => [:java, File.join(CASSANDRA_HOME, 'server'), File.join(CASSANDRA_HOME, 'test', 'data')] do
   env = ""
   if !ENV["CASSANDRA_INCLUDE"]
     env << "CASSANDRA_INCLUDE=#{Dir.pwd}/conf/cassandra.in.sh "
-    env << "CASSANDRA_HOME=#{CASSANDRA_HOME} "
+    env << "CASSANDRA_HOME=#{CASSANDRA_HOME}/server "
     env << "CASSANDRA_CONF=#{Dir.pwd}/conf"
   end
-  # Start server
-  Dir.chdir(CASSANDRA_TEST) do
-    exec("env #{env} #{CASSANDRA_HOME}/bin/cassandra -f")
+
+  Dir.chdir(File.join(CASSANDRA_HOME, 'server')) do
+    sh("env #{env} bin/cassandra -f")
+  end
+end
+
+file File.join(CASSANDRA_HOME, 'server') => File.join(CASSANDRA_HOME, DIST_FILE) do
+  Dir.chdir(CASSANDRA_HOME) do
+    sh "tar xzvf #{DIST_FILE}"
+    sh "mv #{DIST_FILE.split('.')[0..2].join('.')} server"
   end
 end
 
+file File.join(CASSANDRA_HOME, DIST_FILE) => CASSANDRA_HOME do
+  puts "downloading"
+  cmd = "curl -L -o #{File.join(CASSANDRA_HOME, DIST_FILE)} #{DIST_URL}"
+  sh cmd
+end
+
 desc "Check Java version"
 task :java do
   unless `java -version 2>&1`.split("\n").first =~ /java version "1.6/ #"
@@ -53,70 +60,11 @@ task :java do
   end
 end
 
-desc "Check Git version"
-task :git do
-  unless `git --version 2>&1` =~ /git version 1.(6|7)/
-    puts "You need to install git 1.6 or 1.7"
-    exit(1)
-  end
-end
-
-desc "Checkout Cassandra from git"
-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_REPO} #{CASSANDRA_HOME}"
-    if !system(cmd)
-      put "Checkout failed. Try:\n  #{cmd}"
-      exit(1)
-    end
-  end
-end
-
-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."
-      system("rm -rf #{CASSANDRA_TEST}/data")
-      system("ant clean && git fetch && git reset #{REVISION} --hard")
-      # 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
-    end
-  end
-end
-
-desc "Rebuild Cassandra"
-task :build_cassandra => [:checkout_cassandra] do
-  unless File.exist?("#{CASSANDRA_HOME}/build")
-    puts "Building Cassandra"
-    cmd = "cd #{CASSANDRA_HOME} && ant"
-    if !system(cmd)
-      puts "Could not build Casssandra. Try:\n  #{cmd}"
-      exit(1)
-    end
-  end
-end
-
-desc "Clean Cassandra build"
-task :clean_cassandra do
-  puts "Cleaning Cassandra"
-  if File.exist?(CASSANDRA_HOME)
-    Dir.chdir(CASSANDRA_HOME) do
-      system("ant clean")
-    end
-  end
-end
-
 namespace :data do
   desc "Reset test data"
   task :reset do
     puts "Resetting test data"
-    system("rm -rf #{CASSANDRA_TEST}/data")
+    system("rm -rf #{File.join(CASSANDRA_HOME, 'test', 'data')}")
   end
 end
 

data/cassandra.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra}
-  s.version = "0.7.5"
+  s.version = "0.7.6"
 
   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-02-19}
+  s.date = %q{2010-03-01}
   s.default_executable = %q{cassandra_helper}
   s.description = %q{A Ruby client for the Cassandra distributed database.}
   s.email = %q{}

data/lib/cassandra/mock.rb

@@ -15,11 +15,12 @@ class Cassandra
     include ::Cassandra::Helpers
     include ::Cassandra::Columns
 
-    def initialize(keyspace, servers=nil, options={})
+    def initialize(keyspace, storage_xml)
       @keyspace = keyspace
       @column_name_class = {}
       @sub_column_name_class = {}
-      @storage_xml = options[:storage_xml]
+      @storage_xml = storage_xml
+      clear_keyspace!
     end
 
     def clear_keyspace!
@@ -131,14 +132,16 @@ class Cassandra
       !!get(column_family, key, column)
     end
 
-    def multi_get(column_family, keys)
+    def multi_get(column_family, keys, *columns_and_options)
+      column_family, column, sub_column, options = extract_and_validate_params_for_real(column_family, keys, columns_and_options, READ_DEFAULTS)
       keys.inject(OrderedHash.new) do |hash, key|
         hash[key] = get(column_family, key)
         hash
       end
     end
 
-    def remove(column_family, key, column=nil, sub_column=nil)
+    def remove(column_family, key, *columns_and_options)
+      column_family, column, sub_column, options = extract_and_validate_params_for_real(column_family, key, columns_and_options, WRITE_DEFAULTS)
       if @batch
         @batch << [:remove, column_family, key, column]
       else
@@ -154,10 +157,19 @@ class Cassandra
       end
     end
 
-    def get_columns(column_family, key, columns)
+    def get_columns(column_family, key, *columns_and_options)
+      column_family, columns, sub_columns, options = extract_and_validate_params_for_real(column_family, key, columns_and_options, READ_DEFAULTS)
       d = get(column_family, key)
-      columns.collect do |column|
-        d[column]
+
+
+      if sub_columns
+        sub_columns.collect do |sub_column|
+          d[columns][sub_column]
+        end
+      else
+        columns.collect do |column|
+          d[column]
+        end
       end
     end
 
@@ -180,8 +192,7 @@ class Cassandra
     end
 
     def get_range(column_family, options = {})
-      column_family, _, _, options = 
-        extract_and_validate_params_for_real(column_family, "", [options], READ_DEFAULTS)
+      column_family, _, _, options = extract_and_validate_params_for_real(column_family, "", [options], READ_DEFAULTS)
       _get_range(column_family, options[:start], options[:finish], options[:count]).keys
     end
 
@@ -244,10 +255,20 @@ class Cassandra
     end
 
     def extract_and_validate_params_for_real(column_family, keys, args, options)
-      column_family, column, sub_column, options = extract_and_validate_params(column_family, keys, args, options)
+      column_family, columns, sub_column, options = extract_and_validate_params(column_family, keys, args, options)
       options[:start] = nil if options[:start] == ''
       options[:finish] = nil if options[:finish] == ''
-      [column_family, to_compare_with_type(column, column_family), to_compare_with_type(sub_column, column_family, false), options]
+      [column_family, to_compare_with_types(columns, column_family), to_compare_with_types(sub_column, column_family, false), options]
+    end
+
+    def to_compare_with_types(column_names, column_family, standard=true)
+      if column_names.is_a?(Array)
+        column_names.collect do |name|
+          to_compare_with_type(name, column_family, standard)
+        end
+      else
+        to_compare_with_type(column_names, column_family, standard)
+      end
     end
 
     def to_compare_with_type(column_name, column_family, standard=true)

data/lib/cassandra/protocol.rb

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

data/test/cassandra_mock_test.rb

@@ -7,13 +7,13 @@ class CassandraMockTest < CassandraTest
 
   def setup
     storage_xml_path = File.expand_path(File.join(File.dirname(File.dirname(__FILE__)), 'conf', 'storage-conf.xml'))
-    @twitter = Cassandra::Mock.new('Twitter', nil, :storage_xml => storage_xml_path)
+    @twitter = Cassandra::Mock.new('Twitter', storage_xml_path)
     @twitter.clear_keyspace!
 
-    @blogs = Cassandra::Mock.new('Multiblog', nil, :storage_xml => storage_xml_path)
+    @blogs = Cassandra::Mock.new('Multiblog', storage_xml_path)
     @blogs.clear_keyspace!
 
-    @blogs_long = Cassandra::Mock.new('MultiblogLong', nil, :storage_xml => storage_xml_path)
+    @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))) }

data/test/cassandra_test.rb

@@ -54,6 +54,13 @@ class CassandraTest < Test::Unit::TestCase
     assert_equal({}, @blogs.get(:Blogs, 'bogus'))
   end
 
+  def test_get_multiple_time_uuid_columns
+    @blogs.insert(:Blogs, key,
+      {@uuids[0] => 'I like this cat', @uuids[1] => 'Buttons is cuter', @uuids[2] => 'I disagree'})
+
+    assert_equal(['I like this cat', 'Buttons is cuter'], @blogs.get_columns(:Blogs, key, @uuids[0..1]))
+  end
+
   def test_get_first_long_column
     @blogs_long.insert(:Blogs, key, 
       {@longs[0] => 'I like this cat', @longs[1] => 'Buttons is cuter', @longs[2] => 'I disagree'})
@@ -235,6 +242,13 @@ class CassandraTest < Test::Unit::TestCase
       @twitter.get_columns(:StatusRelationships, key, ['user_timelines', 'mentions_timelines'])
   end
 
+  def test_get_sub_column_values_super
+    user_columns = {@uuids[1] => 'v1', @uuids[2] => 'v2'}
+    @twitter.insert(:StatusRelationships, key, {'user_timelines' => user_columns})
+    assert_equal ['v1', 'v2'],
+      @twitter.get_columns(:StatusRelationships, key, 'user_timelines', @uuids[1..2])
+  end
+
   def test_multi_get_columns
     @twitter.insert(:Users, key + '1', {'body' => 'v1', 'user' => 'v1'})
     @twitter.insert(:Users, key + '2', {'body' => 'v2', 'user' => 'v2'})
@@ -282,31 +296,33 @@ class CassandraTest < Test::Unit::TestCase
   end
 
   def test_batch_mutate
-    @twitter.insert(:Users, key + '1', {'body' => 'v1', 'user' => 'v1'})
+    k = key
+
+    @twitter.insert(:Users, k + '1', {'body' => 'v1', 'user' => 'v1'})
 
     @twitter.batch do
-      @twitter.insert(:Users, key + '2', {'body' => 'v2', 'user' => 'v2'})
-      @twitter.insert(:Users, key + '3', {'body' => 'bogus', 'user' => 'v3'})
-      @twitter.insert(:Users, key + '3', {'body' => 'v3', 'location' => 'v3'})
-      @twitter.insert(:Statuses, key + '3', {'body' => 'v'})
+      @twitter.insert(:Users, k + '2', {'body' => 'v2', 'user' => 'v2'})
+      @twitter.insert(:Users, k + '3', {'body' => 'bogus', 'user' => 'v3'})
+      @twitter.insert(:Users, k + '3', {'body' => 'v3', 'location' => 'v3'})
+      @twitter.insert(:Statuses, k + '3', {'body' => 'v'})
 
-      assert_equal({'body' => 'v1', 'user' => 'v1'}, @twitter.get(:Users, key + '1')) # Written
-      assert_equal({}, @twitter.get(:Users, key + '2')) # Not yet written
-      assert_equal({}, @twitter.get(:Statuses, key + '3')) # Not yet written
+      assert_equal({'body' => 'v1', 'user' => 'v1'}, @twitter.get(:Users, k + '1')) # Written
+      assert_equal({}, @twitter.get(:Users, k + '2')) # Not yet written
+      assert_equal({}, @twitter.get(:Statuses, k + '3')) # Not yet written
 
-      @twitter.remove(:Users, key + '1')
-      assert_equal({'body' => 'v1', 'user' => 'v1'}, @twitter.get(:Users, key + '1')) # Not yet removed
+      @twitter.remove(:Users, k + '1')
+      assert_equal({'body' => 'v1', 'user' => 'v1'}, @twitter.get(:Users, k + '1')) # Not yet removed
 
-      @twitter.remove(:Users, key + '4')
-      @twitter.insert(:Users, key + '4', {'body' => 'v4', 'user' => 'v4'})
-      assert_equal({}, @twitter.get(:Users, key + '4')) # Not yet written
+      @twitter.remove(:Users, k + '4')
+      @twitter.insert(:Users, k + '4', {'body' => 'v4', 'user' => 'v4'})
+      assert_equal({}, @twitter.get(:Users, k + '4')) # Not yet written
     end
 
-    assert_equal({'body' => 'v2', 'user' => 'v2'}, @twitter.get(:Users, key + '2')) # Written
-    assert_equal({'body' => 'v3', 'user' => 'v3', 'location' => 'v3'}, @twitter.get(:Users, key + '3')) # Written and compacted
-    assert_equal({'body' => 'v4', 'user' => 'v4'}, @twitter.get(:Users, key + '4')) # Written
-    assert_equal({'body' => 'v'}, @twitter.get(:Statuses, key + '3')) # Written
-    assert_equal({}, @twitter.get(:Users, key + '1')) # Removed
+    assert_equal({'body' => 'v2', 'user' => 'v2'}, @twitter.get(:Users, k + '2')) # Written
+    assert_equal({'body' => 'v3', 'user' => 'v3', 'location' => 'v3'}, @twitter.get(:Users, k + '3')) # Written and compacted
+    assert_equal({'body' => 'v4', 'user' => 'v4'}, @twitter.get(:Users, k + '4')) # Written
+    assert_equal({'body' => 'v'}, @twitter.get(:Statuses, k + '3')) # Written
+    assert_equal({}, @twitter.get(:Users, k + '1')) # Removed
   end
 
   def test_complain_about_nil_key

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cassandra
 version: !ruby/object:Gem::Version 
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors: 
 - Evan Weaver, Ryan King
@@ -30,7 +30,7 @@ cert_chain:
   zyKMYVRO0z/58g==
   -----END CERTIFICATE-----
 
-date: 2010-02-19 00:00:00 -08:00
+date: 2010-03-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 

metadata.gz.sig

@@ -1 +1,3 @@
-��0IE<u^ۙ@hBFC#��;�uP㆐�|+ۺ��f�TD^�ƞ��9�f"�WM����
br��j+Ƌ:x��`�X��?�0�a�M�^�`6Q�O����y}D���-�����ߎN�_*��5�ֹ1w
+����R���2	^M/[X*�'�|H�M�(��
+`��)z�Av�����j��%�V�j�TV�p�E;�?�k���|�	��[���x��F����}��̉���
+w�xpm�5{8y�,Bc����l}������+w:����43���嵚����9A