eurydice 1.1.1.b1-java → 1.2.0-java

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eurydice (1.1.0.b4-java)
+    eurydice (1.2.0-java)
       pelops-jars (>= 1.3.0)
 
 GEM

data/lib/eurydice.rb

@@ -9,4 +9,5 @@ module Eurydice
   class KeyspaceExistsError < InvalidRequestError; end
   class NotFoundError < EurydiceError; end
   class TimeoutError < EurydiceError; end
+  class BatchError < EurydiceError; end
 end

data/lib/eurydice/pelops.rb

@@ -118,9 +118,21 @@ module Eurydice
         transform_thrift_exception(e)
       end
     end
+    
+    module ConsistencyLevelHelpers
+      def get_cl(options)
+        cl = options.fetch(:consistency_level, options.fetch(:cl, :one))
+        Cassandra::CONSISTENCY_LEVELS[cl]
+      end
+      
+      def default_cl?(options)
+        !(options.key?(:consistency_level) || options.key?(:cl))
+      end
+    end
   end
 end
 
+require_relative 'pelops/mutator'
 require_relative 'pelops/cluster'
 require_relative 'pelops/keyspace'
 require_relative 'pelops/column_family'

data/lib/eurydice/pelops/column_family.rb

@@ -5,6 +5,7 @@ module Eurydice
     class ColumnFamily
       include ExceptionHelpers
       include ByteHelpers
+      include ConsistencyLevelHelpers
     
       attr_reader :name, :keyspace
     
@@ -47,20 +48,20 @@ module Eurydice
       end
     
       def delete_column(row_key, column_key, options={})
-        batch(options) do |b|
-          b.delete_column(row_key, column_key)
+        @keyspace.batch(options) do |b|
+          b.delete_column(@name, row_key, column_key)
         end
       end
     
       def delete_columns(row_key, column_keys, options={})
-        batch(options) do |b|
-          b.delete_columns(row_key, column_keys)
+        @keyspace.batch(options) do |b|
+          b.delete_columns(@name, row_key, column_keys)
         end
       end
     
       def update(row_key, properties, options={})
-        batch(options) do |b|
-          b.update(row_key, properties, options)
+        @keyspace.batch(options) do |b|
+          b.update(@name, row_key, properties, options)
         end
       end
       alias_method :insert, :update
@@ -247,54 +248,6 @@ module Eurydice
         end
         return key, value
       end
-      
-      module ConsistencyLevelHelpers
-        def get_cl(options)
-          cl = options.fetch(:consistency_level, options.fetch(:cl, :one))
-          Cassandra::CONSISTENCY_LEVELS[cl]
-        end
-      end
-      
-      include ConsistencyLevelHelpers
-      
-      class Batch
-        include ExceptionHelpers
-        include ByteHelpers
-        include ConsistencyLevelHelpers
-        
-        def initialize(name, keyspace)
-          @name = name
-          @keyspace = keyspace
-          @mutator = @keyspace.create_mutator
-        end
-        
-        def delete_column(row_key, column_key)
-          @mutator.delete_column(@name, row_key, to_pelops_bytes(column_key))
-        end
-    
-        def delete_columns(row_key, column_keys)
-          @mutator.delete_columns(@name, row_key, column_keys.map { |k| to_pelops_bytes(k) })
-        end
-    
-        def update(row_key, properties, options={})
-          types = options[:validations] || {}
-          key_type = options[:comparator]
-          columns = properties.map do |k, v|
-            key = to_pelops_bytes(k, key_type)
-            value = to_pelops_bytes(v, types[k])
-            ttl = options.fetch(:ttl, @mutator.class::NO_TTL)
-            @mutator.new_column(key, value, ttl)
-          end
-          @mutator.write_columns(@name, row_key, columns)
-        end
-        alias_method :insert, :update
-        
-        def execute!(options={})
-          thrift_exception_handler do
-            @mutator.execute(get_cl(options))
-          end
-        end
-      end
     end
   end
 end

data/lib/eurydice/pelops/keyspace.rb

@@ -4,6 +4,7 @@ module Eurydice
   module Pelops
     class Keyspace
       include ExceptionHelpers
+      include ConsistencyLevelHelpers
     
       attr_reader :name
     
@@ -12,6 +13,7 @@ module Eurydice
         @cluster = cluster
         @pool_name = pool_name
         @driver = driver
+        @batch_key = "#{@name}-batch"
       end
     
       def definition(reload=false)
@@ -74,10 +76,67 @@ module Eurydice
         @column_family_manger ||= @driver.create_column_family_manager(@cluster, @name)
       end
       
+      def batch(options={})
+        if batch_in_progress?
+          check_batch_options!(options)
+          yield current_batch_mutator
+        else
+          start_batch(options)
+          begin
+            yield current_batch_mutator
+          rescue
+            clear_batch!
+            raise
+          end
+          end_batch!
+        end
+      end
+      
     private
     
       DEFAULT_STRATEGY_CLASS = Cassandra::LOCATOR_STRATEGY_CLASSES[:simple]
       DEFAULT_STRATEGY_OPTIONS = {:replication_factor => 1}.freeze
+
+      def start_batch(options={})
+        thread_local_storage[@batch_key] ||= {
+          :mutator => Mutator.new(self),
+          :options => options
+        }
+      end
+      
+      def batch_in_progress?
+        !!thread_local_storage[@batch_key]
+      end
+      
+      def check_batch_options!(options)
+        unless default_cl?(options)
+          required_cl = get_cl(options)
+          current_cl = get_cl(current_batch_options)
+          raise BatchError, %(Inconsistent consistency levels! Current batch: #{current_cl}, required: #{required_cl}) unless required_cl == current_cl
+        end
+      end
+      
+      def current_batch_mutator
+        thread_local_storage[@batch_key][:mutator]
+      end
+      
+      def current_batch_options
+        thread_local_storage[@batch_key][:options]
+      end
+
+      def clear_batch!
+        thread_local_storage.delete(@batch_key)
+        nil
+      end
+      
+      def end_batch!
+        current_batch_mutator.execute!(current_batch_options)
+        clear_batch!
+      end
+      
+      def thread_local_storage
+        Thread.current[:eurydice_pelops] ||= {}
+      end
     end
   end
 end

data/lib/eurydice/pelops/mutator.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+
+module Eurydice
+  module Pelops
+    class Mutator
+      include ExceptionHelpers
+      include ConsistencyLevelHelpers
+      include ByteHelpers
+      
+      def initialize(keyspace)
+        @keyspace = keyspace
+        @mutator = @keyspace.create_mutator
+      end
+        
+      def delete_column(cf_name, row_key, column_key)
+        @mutator.delete_column(cf_name, row_key, to_pelops_bytes(column_key))
+      end
+    
+      def delete_columns(cf_name, row_key, column_keys)
+        @mutator.delete_columns(cf_name, row_key, column_keys.map { |k| to_pelops_bytes(k) })
+      end
+    
+      def update(cf_name, row_key, properties, options={})
+        types = options[:validations] || {}
+        key_type = options[:comparator]
+        columns = properties.map do |k, v|
+          key = to_pelops_bytes(k, key_type)
+          value = to_pelops_bytes(v, types[k])
+          ttl = options.fetch(:ttl, @mutator.class::NO_TTL)
+          @mutator.new_column(key, value, ttl)
+        end
+        @mutator.write_columns(cf_name, row_key, columns)
+      end
+      alias_method :insert, :update
+        
+      def execute!(options={})
+        thrift_exception_handler do
+          @mutator.execute(get_cl(options))
+        end
+      end
+    end
+  end
+end

data/lib/eurydice/version.rb

@@ -2,5 +2,5 @@
 
 
 module Eurydice
-  VERSION = '1.1.1.b1'
+  VERSION = '1.2.0'
 end

data/spec/eurydice/support/column_family.rb

@@ -568,26 +568,5 @@ module Eurydice
         end
       end
     end
-    
-    context 'batch mutation' do
-      before do
-        @cf = @keyspace.column_family('test_family')
-        @cf.truncate!
-      end
-      
-      describe '#batch' do
-        it 'yields a batch object which can be used to perform multiple mutations' do
-          @cf.batch do |batch|
-            batch.update('first_row', 'col1' => 'hello1', 'col2' => 'hello2')
-            batch.update('second_row', 'col1' => 'hello3', 'xyz' => 'hello', 'abc' => 'hello')
-            batch.delete_column('first_row', 'col2')
-            batch.delete_columns('second_row', %w(xyz abc))
-            batch.update('first_row', 'col3' => 'hello4')
-          end
-          @cf.get('first_row').should == {'col1' => 'hello1', 'col3' => 'hello4'}
-          @cf.get('second_row').should == {'col1' => 'hello3'}
-        end
-      end
-    end
   end
 end

data/spec/eurydice/support/keyspace.rb

@@ -76,5 +76,102 @@ module Eurydice
         definition[:strategy_options].should == {:replication_factor => 1}
       end
     end
+  
+    describe '#batch' do
+      before do
+        @keyspace = @cluster.keyspace(@keyspace_name)
+        @cf1 = @keyspace.column_family('cf1')
+        @cf2 = @keyspace.column_family('cf2')
+      end
+      
+      it 'starts and executes a batch' do
+        @keyspace.batch do
+          @cf1.insert('row1', 'foo' => 'bar', 'baz' => 'qux')
+          @cf1.insert('row2', 'xyz' => '123', 'abc' => '123')
+          @cf2.insert('item1', 'hello' => 'world')
+          @cf1.delete_column('row2', 'abc')
+          @cf1.get('row1').should be_nil
+          @cf1.get('row2').should be_nil
+          @cf2.get('item1').should be_nil
+        end
+        @cf1.get('row1').should == {'foo' => 'bar', 'baz' => 'qux'}
+        @cf1.get('row2').should == {'xyz' => '123'}
+        @cf2.get('item1').should == {'hello' => 'world'}
+      end
+      
+      it 'only has one active batch' do
+        @keyspace.batch do
+          @keyspace.batch do
+            @keyspace.batch do
+              @cf1.insert('row1', 'foo' => 'bar')
+            end
+            @cf1.get('row1').should be_nil
+            @keyspace.batch do
+              @cf1.insert('row1', 'baz' => 'qux')
+            end
+            @cf1.get('row1').should be_nil
+          end
+          @cf1.get('row1').should be_nil
+        end
+        @cf1.get('row1').should == {'foo' => 'bar', 'baz' => 'qux'}
+      end
+      
+      it 'aborts the batch on error' do
+        begin
+          @keyspace.batch do
+            @cf1.insert('row1', 'foo' => 'bar')
+            @cf1.insert('row2', 'foo' => 'bar')
+            raise 'hurgh!'
+          end
+        rescue
+        end
+        @cf1.get('row1').should be_nil
+        @cf1.get('row2').should be_nil
+      end
+      
+      context 'conflicting batch options' do
+        it 'complains when the options given to the #batch contain different consistency levels' do
+          expect {
+            @keyspace.batch(:cl => :one) do
+              @keyspace.batch(:cl => :quorum) do
+                @cf1.insert('row1', 'foo' => 'bar')
+              end
+            end
+          }.to raise_error(BatchError)
+        end
+
+        it 'complains when the options given to a mutation call has different consistency levels than the options to the #batch call' do
+          expect {
+            @keyspace.batch(:cl => :one) do
+              @keyspace.batch do
+                @cf1.insert('row1', {'foo' => 'bar'}, {:cl => :quorum})
+              end
+            end
+          }.to raise_error(BatchError)
+        end
+        
+        it 'does not complain when no explicit options are specified' do
+          expect {
+            @keyspace.batch(:cl => :quorum) do
+              @keyspace.batch do
+                @cf1.insert('row1', {'foo' => 'bar'})
+              end
+            end
+          }.not_to raise_error(BatchError)          
+        end
+        
+        it 'aborts the batch on conflicting consistency levels' do
+          begin
+            @keyspace.batch(:cl => :quorum) do
+              @cf1.insert('row1', {'foo' => 'bar'}, {:cl => :quorum})
+              @cf1.insert('row2', {'foo' => 'bar'}, {:cl => :one})
+            end
+          rescue
+          end
+          @cf1.get('row1').should be_nil
+          @cf1.get('row2').should be_nil
+        end
+      end
+    end
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: eurydice
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 1.1.1.b1
+  prerelease: 
+  version: 1.2.0
 platform: java
 authors: 
   - Theo Hultberg
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-02 00:00:00 Z
+date: 2012-03-03 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: pelops-jars
@@ -54,6 +54,7 @@ files:
   - lib/eurydice/pelops/cluster.rb
   - lib/eurydice/pelops/column_family.rb
   - lib/eurydice/pelops/keyspace.rb
+  - lib/eurydice/pelops/mutator.rb
   - lib/eurydice/version.rb
   - spec/eurydice/pelops/cluster_spec.rb
   - spec/eurydice/pelops/column_family_spec.rb
@@ -79,9 +80,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.1
+        version: "0"
 requirements: []
 
 rubyforge_project: eurydice