eurydice 1.0.3-java → 1.1.0.b2-java

data/.gitignore

@@ -1 +1,2 @@
 /ext
+/pkg

data/Gemfile

@@ -1,5 +1,7 @@
 source :rubygems
 
+gem 'pelops-jars', '1.3.0.b3'
+
 gemspec
 
 group :development do

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    eurydice (1.0.0-java)
-      pelops-jars (= 1.2)
+    eurydice (1.1.0.b2-java)
+      pelops-jars (>= 1.2.9)
 
 GEM
   remote: http://rubygems.org/
   specs:
     bouncy-castle-java (1.5.0146.1)
-    cassandra-jars (0.8.0-java)
+    cassandra-jars (1.0.0-java)
     diff-lcs (1.1.2)
     jruby-openssl (0.7.4)
       bouncy-castle-java
-    pelops-jars (1.2-java)
-      cassandra-jars (~> 0.8.0)
+    pelops-jars (1.3.0.b3-java)
+      cassandra-jars (~> 1.0.0)
     rake (0.9.2)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
@@ -30,5 +30,6 @@ PLATFORMS
 DEPENDENCIES
   eurydice!
   jruby-openssl
+  pelops-jars (= 1.3.0.b3)
   rake
   rspec

data/eurydice.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = 'eurydice'
   
-  s.add_dependency 'pelops-jars', '= 1.2'
+  s.add_dependency 'pelops-jars', '>= 1.2.9'
 
   s.files         = `git ls-files`.split("\n")
   s.require_paths = %w(lib)

data/lib/cassandra.rb

@@ -24,12 +24,14 @@ module Cassandra
   }.freeze
 
   MARSHAL_TYPES = {
-    :bytes        => 'org.apache.cassandra.db.marshal.BytesType'.freeze,
-    :ascii        => 'org.apache.cassandra.db.marshal.AsciiType'.freeze,
-    :utf8         => 'org.apache.cassandra.db.marshal.UTF8Type'.freeze,
-    :long         => 'org.apache.cassandra.db.marshal.LongType'.freeze,
-    :lexical_uuid => 'org.apache.cassandra.db.marshal.LexicalUUIDType'.freeze,
-    :time_uuid    => 'org.apache.cassandra.db.marshal.TimeUUIDType'.freeze
+    :bytes          => 'org.apache.cassandra.db.marshal.BytesType'.freeze,
+    :ascii          => 'org.apache.cassandra.db.marshal.AsciiType'.freeze,
+    :utf8           => 'org.apache.cassandra.db.marshal.UTF8Type'.freeze,
+    :long           => 'org.apache.cassandra.db.marshal.LongType'.freeze,
+    :lexical_uuid   => 'org.apache.cassandra.db.marshal.LexicalUUIDType'.freeze,
+    :time_uuid      => 'org.apache.cassandra.db.marshal.TimeUUIDType'.freeze,
+    :counter        => 'org.apache.cassandra.db.marshal.CounterColumnType'.freeze,
+    :counter_column => 'org.apache.cassandra.db.marshal.CounterColumnType'.freeze
   }.freeze
   
   INDEX_OPERATORS = {

data/lib/eurydice/pelops/column_family.rb

@@ -79,6 +79,17 @@ module Eurydice
       end
       alias_method :insert, :update
     
+      def increment(row_key, column_key, amount=1, options={})
+        thrift_exception_handler do
+          mutator = @keyspace.create_mutator
+          mutator.write_counter_column(@name, to_pelops_bytes(row_key), to_pelops_bytes(column_key), amount)
+          mutator.execute(get_cl(options))
+        end
+      end
+      alias_method :inc, :increment
+      alias_method :incr, :increment
+      alias_method :increment_column, :increment
+    
       def key?(row_key, options={})
         thrift_exception_handler do
           selector = @keyspace.create_selector
@@ -101,8 +112,13 @@ module Eurydice
       def get_column(row_key, column_key, options={})
         thrift_exception_handler do
           selector = @keyspace.create_selector
-          column = selector.get_column_from_row(@name, row_key, column_key, get_cl(options))
-          byte_array_to_s(column.get_value)
+          if counter_columns?
+            column = selector.get_counter_column_from_row(@name, to_pelops_bytes(row_key), to_pelops_bytes(column_key), get_cl(options))
+            column.get_value
+          else
+            column =selector.get_column_from_row(@name, to_pelops_bytes(row_key), to_pelops_bytes(column_key), get_cl(options))
+            byte_array_to_s(column.get_value)
+          end
         end
       rescue NotFoundError => e
         nil
@@ -158,11 +174,19 @@ module Eurydice
     
       EMPTY_STRING = ''.freeze
     
+      def counter_columns?
+        @is_counter_cf ||= definition[:default_validation_class] == Cassandra::MARSHAL_TYPES[:counter]
+      end
+    
       def get_single(row_key, options={})
         thrift_exception_handler do
           selector = @keyspace.create_selector
           column_predicate = create_column_predicate(options)
-          columns = selector.get_columns_from_row(@name, to_pelops_bytes(row_key), column_predicate, get_cl(options))
+          if counter_columns?
+            columns = selector.get_counter_columns_from_row(@name, to_pelops_bytes(row_key), column_predicate, get_cl(options))
+          else
+            columns = selector.get_columns_from_row(@name, to_pelops_bytes(row_key), column_predicate, get_cl(options))
+          end
           columns_to_h(columns, options)
         end
       end
@@ -172,7 +196,11 @@ module Eurydice
           selector = @keyspace.create_selector
           column_predicate = create_column_predicate(options)
           byte_row_keys = row_keys.map { |rk| to_pelops_bytes(rk) }
-          rows = selector.get_columns_from_rows(@name, byte_row_keys, column_predicate, get_cl(options))
+          if counter_columns?
+            rows = selector.get_counter_columns_from_rows(@name, byte_row_keys, column_predicate, get_cl(options))
+          else
+            rows = selector.get_columns_from_rows(@name, byte_row_keys, column_predicate, get_cl(options))
+          end
           rows_to_h(rows, options)
         end
       end
@@ -218,7 +246,10 @@ module Eurydice
         types = options[:validations] || {}
         key_type = options[:comparator]
         key = byte_array_to_s(column.get_name, key_type)
-        value = byte_array_to_s(column.get_value, types[key])
+        value = if counter_columns? 
+          then column.get_value 
+          else byte_array_to_s(column.get_value, types[key])
+        end
         return key, value
       end
   

data/lib/eurydice/pelops.rb

@@ -16,8 +16,8 @@ module Pelops
 end
 
 module Eurydice
-  def self.connect
-    Pelops.connect
+  def self.connect(*args)
+    Pelops.connect(*args)
   end
   
   def self.disconnect!
@@ -29,7 +29,8 @@ module Eurydice
       host = options.fetch(:host, 'localhost')
       port = options.fetch(:port, 9160)
       pool_name = options.fetch(:pool_name, 'eurydice')
-      Cluster.new(::Pelops::Cluster.new(host, port))
+      dynamic_node_discovery = options.fetch(:dynamic_node_discovery, false)
+      Cluster.new(::Pelops::Cluster.new(host, port, dynamic_node_discovery))
     end
   
     def self.keyspace(keyspace_name, host='localhost', port=9160, pool_name='eurydice')

data/lib/eurydice/version.rb

@@ -2,5 +2,5 @@
 
 
 module Eurydice
-  VERSION = '1.0.3'
+  VERSION = '1.1.0.b2'
 end

data/spec/eurydice/pelops/column_family_spec.rb

@@ -181,6 +181,12 @@ module Eurydice
           @cf = @keyspace.column_family('test_family')
           @cf.truncate!
         end
+        
+        before do
+          @counter_cf = @keyspace.column_family('counter_family', :create => false)
+          @counter_cf.create!(:default_validation_class => :counter) unless @counter_cf.exists?
+          @counter_cf.truncate!
+        end
             
         describe '#update/#insert' do
           it 'writes a column' do
@@ -230,6 +236,26 @@ module Eurydice
             end
           end
         end
+
+        describe '#increment' do
+          it 'can increment a counter column' do
+            @cf.increment('ABC', 'count')
+            @cf.get_column('ABC', 'count').should == 1
+          end
+
+          it 'can increment a counter column by the specified amount' do
+            @cf.increment('ABC', 'count', 3)
+            @cf.increment('ABC', 'count', 2)
+            @cf.get_column('ABC', 'count').should == 5
+          end
+          
+          [:inc, :incr, :increment_column].each do |name|
+            it "is aliased as #{name}" do
+              @cf.send(name, 'ABC', 'count')
+              @cf.get_column('ABC', 'count').should == 1
+            end
+          end
+        end
   
         describe '#get' do
           context 'with a single row key' do
@@ -275,6 +301,14 @@ module Eurydice
             it 'returns nil if no row was found' do
               @cf.get('XYZ').should be_nil
             end
+            
+            it 'loads the value of counter columns' do
+              @counter_cf.increment('ABC', 'a', 1)
+              @counter_cf.increment('ABC', 'b', 2)
+              @counter_cf.increment('ABC', 'c', 4)
+              @counter_cf.increment('ABC', 'd', 8)
+              @counter_cf.get('ABC', :columns => %w(a b c d)).should == {'a' => 1, 'b' => 2, 'c' => 4, 'd' => 8}
+            end
           end
           
           context 'with multiple row keys' do
@@ -331,6 +365,17 @@ module Eurydice
             it 'returns an empty hash if no rows exist' do
               @cf.get(%w(ABC GHI)).should == {}
             end
+            
+            it 'loads the value of counter columns' do
+              @counter_cf.increment('ABC', 'a', 1)
+              @counter_cf.increment('ABC', 'b', 2)
+              @counter_cf.increment('DEF', 'c', 4)
+              @counter_cf.increment('DEF', 'd', 8)
+              @counter_cf.get(%w(ABC DEF), :columns => %w(a b c d)).should == {
+                'ABC' => {'a' => 1, 'b' => 2}, 
+                'DEF' => {'c' => 4, 'd' => 8}
+              }
+            end
           end
           
           context 'with options' do
@@ -372,11 +417,16 @@ module Eurydice
             @cf.insert('ABC', 'xyz' => 'abc', 'hello' => 'world', 'foo' => 'bar')
             @cf.get_column('XYZ', 'abc').should be_nil
           end
+          
+          it 'returns the value of a counter column' do
+            @counter_cf.increment('ABC', 'x', 8)
+            @counter_cf.get_column('ABC', 'x').should == 8
+          end
         end
 
         describe '#get_column_count' do
           it 'returns the number of columns in the specified row' do
-            @cf.insert('ABC', Hash[('a'..'z').zip(0..9 * 10)])
+            @cf.insert('ABC', Hash[('a'..'z').zip(0..100)])
             @cf.get_column_count('ABC').should == 26
           end
           
@@ -385,12 +435,12 @@ module Eurydice
           end
           
           it 'returns the number of columns in the specified range' do
-            @cf.insert('ABC', Hash[('a'..'z').zip(0..9 * 10)])
+            @cf.insert('ABC', Hash[('a'..'z').zip(0..100)])
             @cf.get_column_count('ABC', :columns => 'm'..'q').should == 5
           end
 
           it 'returns the number of columns after the specified column' do
-            @cf.insert('ABC', Hash[('a'..'z').zip(0..9 * 10)])
+            @cf.insert('ABC', Hash[('a'..'z').zip(0..100)])
             @cf.get_column_count('ABC', :from_column => 's').should == 8
           end
         end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: eurydice
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.0.3
+  prerelease: 6
+  version: 1.1.0.b2
 platform: java
 authors: 
   - Theo Hultberg
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-08 00:00:00 Z
+date: 2011-11-28 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: pelops-jars
@@ -18,9 +18,9 @@ dependencies:
     requirement: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - "="
+        - - ">="
           - !ruby/object:Gem::Version 
-            version: "1.2"
+            version: 1.2.9
     type: :runtime
     version_requirements: *id001
 description: ""
@@ -76,9 +76,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.1
 requirements: []
 
 rubyforge_project: eurydice