cassandra 0.17.0 → 0.18.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+v0.18.0
+- Cassandra 1.2 support (issue #175, courtesy @brainopia)
+- drop_keyspace defaults to current keyspace (issue #176, courtesy @brianopia)
+- Easier flush_batch interface (issue #182, courtesy @brianopia)
+- Support for removing multiple columns (issue #183, courtesy @brianopia)
+
 v0.17.0
 - multi_get_columns with only one query (courtesy @christian-blades-cb)
 - documentation fixes for get and multi_get (issue #136, courtesy @christian-blades-cb)

data/Rakefile

@@ -22,7 +22,8 @@ CassandraBinaries = {
   '0.7' => 'http://archive.apache.org/dist/cassandra/0.7.9/apache-cassandra-0.7.9-bin.tar.gz',
   '0.8' => 'http://archive.apache.org/dist/cassandra/0.8.7/apache-cassandra-0.8.7-bin.tar.gz',
   '1.0' => 'http://archive.apache.org/dist/cassandra/1.0.6/apache-cassandra-1.0.6-bin.tar.gz',
-  '1.1' => 'http://archive.apache.org/dist/cassandra/1.1.5/apache-cassandra-1.1.5-bin.tar.gz'
+  '1.1' => 'http://archive.apache.org/dist/cassandra/1.1.5/apache-cassandra-1.1.5-bin.tar.gz',
+  '1.2' => 'http://archive.apache.org/dist/cassandra/1.2.1/apache-cassandra-1.2.1-bin.tar.gz'
 }
 
 CASSANDRA_HOME = ENV['CASSANDRA_HOME'] || "#{ENV['HOME']}/cassandra"

data/cassandra.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "cassandra"
-  s.version = "0.17.0"
+  s.version = "0.18.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver, Ryan King"]

data/lib/cassandra/cassandra.rb

@@ -1,4 +1,3 @@
-
 =begin rdoc
 Create a new Cassandra client instance. Accepts a keyspace name, and optional host and port.
 
@@ -353,7 +352,7 @@ class Cassandra
   #
   # Returns the new schema id.
   #
-  def drop_keyspace(keyspace)
+  def drop_keyspace(keyspace=@keyspace)
     return false if Cassandra.VERSION.to_f < 0.7
 
     begin
@@ -481,27 +480,31 @@ class Cassandra
   #   * :timestamp - Uses the current time if none specified.
   #   * :consistency - Uses the default write consistency if none specified.
   #
-  # TODO: we could change this function or add another that support multi-column removal (by list or predicate)
-  #
   def remove(column_family, key, *columns_and_options)
-    column_family, column, sub_column, options = extract_and_validate_params(column_family, key, columns_and_options, WRITE_DEFAULTS)
+    column_family, columns, sub_column, options = extract_and_validate_params(column_family, key, columns_and_options, WRITE_DEFAULTS)
 
-    if @batch
-      mutation_map =
-        {
-          key => {
-            column_family => [ _delete_mutation(column_family, column, sub_column, options[:timestamp]|| Time.stamp) ]
-          }
-        }
-      @batch << [mutation_map, options[:consistency]]
+    if columns.is_a? Array
+      if sub_column
+        raise ArgumentError, 'remove does not support sub_columns with array of columns'
+      end
     else
-      # Let's continue using the 'remove' thrift method...not sure about the implications/performance of using the mutate instead
-      # Otherwise we coul get use the mutation_map above, and do _mutate(mutation_map, options[:consistency])
-      args = {:column_family => column_family}
-      columns = is_super(column_family) ? {:super_column => column, :column => sub_column} : {:column => column}
-      column_path = CassandraThrift::ColumnPath.new(args.merge(columns))
-      _remove(key, column_path, options[:timestamp] || Time.stamp, options[:consistency])
+      columns = [columns]
     end
+
+    timestamp = options[:timestamp]|| Time.stamp
+
+    mutation_map =
+      {
+        key => {
+          column_family => columns.map {|column|
+            _delete_mutation(column_family, column, sub_column, timestamp)
+          }
+        }
+      }
+
+    mutation = [mutation_map, options[:consistency]]
+
+    @batch ? @batch << mutation : _mutate(*mutation)
   end
 
   ##
@@ -571,7 +574,7 @@ class Cassandra
   #   * :consistency - Uses the default read consistency if none specified.
   #
   def multi_get_columns(column_family, keys, *columns_and_options)
-    column_family, columns, sub_columns, options = 
+    column_family, columns, sub_columns, options =
       extract_and_validate_params(column_family, keys, columns_and_options, READ_DEFAULTS)
     _multi_get_columns(column_family, keys, columns, sub_columns, options[:consistency])
   end
@@ -861,7 +864,7 @@ class Cassandra
   ##
   # Send the batch queue to the server
   #
-  def flush_batch(options)
+  def flush_batch(options={})
     compacted_map,seen_clevels = compact_mutations!
 
     clevel = if options[:consistency] != nil # Override any clevel from individual mutations if
@@ -874,7 +877,7 @@ class Cassandra
 
     _mutate(compacted_map,clevel)
   end
-  
+
   ##
   # Create secondary index.
   #

data/lib/cassandra/mock.rb

@@ -151,15 +151,26 @@ class Cassandra
     end
 
     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)
+      column_family, columns, 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, sub_column]
+        @batch << [:remove, column_family, key, columns, sub_column]
       else
-        if column
+        if columns
           if sub_column
-            cf(column_family)[key][column].delete(sub_column.to_s) if cf(column_family)[key][column]
+            if columns.is_a? Array
+              raise ArgumentError, 'remove does not support sub_columns with array of columns'
+            end
+
+            if cf(column_family)[key][columns]
+              cf(column_family)[key][columns].delete(sub_column.to_s)
+            end
           else
-            cf(column_family)[key].delete(column.to_s)  if cf(column_family)[key]
+            if cf(column_family)[key]
+              Array(columns).each do |column|
+                cf(column_family)[key].delete(column.to_s)
+              end
+            end
           end
         else
           cf(column_family).delete(key)

data/test/cassandra_test.rb

@@ -428,6 +428,13 @@ class CassandraTest < Test::Unit::TestCase
     assert_nil @twitter.get(:Statuses, key).timestamps['body']
   end
 
+  def test_remove_values
+    @twitter.insert(:Statuses, key, {'body' => 'v', 'location' => 'v'})
+    @twitter.remove(:Statuses, key, ['body', 'location'])
+    assert_nil @twitter.get(:Statuses, key, 'body')
+    assert_nil @twitter.get(:Statuses, key, 'location')
+  end
+
   def test_remove_super_key
     @twitter.insert(:StatusRelationships, key, {'user_timelines' => {@uuids[1] => 'v1'}})
     @twitter.remove(:StatusRelationships, key)
@@ -1327,6 +1334,24 @@ class CassandraTest < Test::Unit::TestCase
     assert(columns.timestamps[@uuids[1]] / 1000000 >= base_time.to_i)
   end
 
+  def test_keyspace_operations
+    system = Cassandra.new 'system'
+    keyspace_name = 'robots'
+    keyspace_definition = Cassandra::Keyspace.new :name => keyspace_name,
+      :strategy_class => 'SimpleStrategy',
+      :strategy_options => { 'replication_factor' => '2' },
+      :cf_defs => []
+    system.add_keyspace keyspace_definition
+    assert system.keyspaces.any? {|it| it == keyspace_name }
+
+    system.drop_keyspace keyspace_name
+    assert system.keyspaces.none? {|it| it == keyspace_name }
+
+    system.add_keyspace keyspace_definition
+    Cassandra.new(keyspace_name).drop_keyspace
+    assert system.keyspaces.none? {|it| it == keyspace_name }
+  end
+
   private
 
   def key

data/test/test_helper.rb

@@ -5,7 +5,11 @@ require "#{File.expand_path(File.dirname(__FILE__))}/../lib/cassandra/#{CASSANDR
 begin; require 'ruby-debug'; rescue LoadError; end
 
 begin
-  @test_client = Cassandra.new('Twitter', 'localhost:9160', {:exception_classes => []})
+  @test_client = Cassandra.new('Twitter', 'localhost:9160', :thrift_client_options => {
+    :retries         => 3,
+    :timeout         => 5,
+    :connect_timeout => 1
+  })
 rescue Thrift::TransportException => e
   #FIXME Make server automatically start if not running
   if e.message =~ /Could not connect/

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 17
+  - 18
   - 0
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors: 
 - Evan Weaver, Ryan King