eurydice 1.0.1-java → 1.0.2-java

data/examples/05_loading_data.rb

@@ -6,6 +6,7 @@ require_relative 'common'
 cluster = Eurydice.connect
 keyspace = cluster.keyspace('my_keyspace')
 column_family = keyspace.column_family('employees', :create => false)
+column_family.drop! if column_family.exists?
 column_family.create!(:column_metadata => {'name' => {:validation_class => :utf8, :index_name => 'name_index', :index_type => :keys}})
 column_family.insert('employee:1', {'name' => 'Sam', 'role' => 'Developer'})
 column_family.insert('employee:2', {'name' => 'Phil', 'role' => 'Accountant'})
@@ -40,6 +41,18 @@ end
 
 puts '---'
 
+column_family.insert('letters', ('a'..'z').to_a.zip(('A'..'Z').to_a))
+
+# Load a page of columns
+result = column_family.get('letters', :max_column_count => 10)
+puts result.keys.join(', ')
+# For the next page you need to tell Eurydice which the last key you saw was
+result = column_family.get('letters', :from_column => result.keys.last, :max_column_count => 11)
+# The last key is included in the next page (so we load one extra column, and shift off the first column)
+puts result.keys[1..-1].join(', ')
+
+puts '---'
+
 # Load only the value from a single column
 employee1_name = column_family.get_column('employee:1', 'name')
 puts "employee:1 => #{employee1_name}"

data/lib/eurydice/pelops/column_family.rb

@@ -148,6 +148,8 @@ module Eurydice
       
     private
     
+      EMPTY_STRING = ''.freeze
+    
       def get_single(row_key, options={})
         thrift_exception_handler do
           selector = @keyspace.create_selector
@@ -170,6 +172,10 @@ module Eurydice
       def create_column_predicate(options)
         max_column_count = options.fetch(:max_column_count, java.lang.Integer::MAX_VALUE)
         reversed = options.fetch(:reversed, false)
+        if options.key?(:from_column)
+          raise ArgumentError, %(You can set either :columns or :from_column, but not both) if options.key?(:columns)
+          options[:columns] = options[:from_column]..EMPTY_STRING
+        end
         case options[:columns]
         when Range
           ::Pelops::Selector.new_columns_predicate(to_pelops_bytes(options[:columns].begin), to_pelops_bytes(options[:columns].end), reversed, max_column_count)

data/lib/eurydice/version.rb

@@ -2,5 +2,5 @@
 
 
 module Eurydice
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/spec/eurydice/pelops/column_family_spec.rb

@@ -258,6 +258,15 @@ module Eurydice
               @cf.get('ABC', :max_column_count => 10).should == Hash[('a'..'z').take(10).map { |a| [a, a.upcase] }]
             end
             
+            it 'loads a page of columns' do
+              @cf.insert('ABC', Hash[('a'..'z').map { |a| [a, a.upcase] }.shuffle])
+              @cf.get('ABC', :from_column => 'm', :max_column_count => 10).should == Hash[('m'..'z').take(10).map { |a| [a, a.upcase] }]
+            end
+            
+            it 'raises an error if both :columns and :from_column are given' do
+              expect { @cf.get('ABC', :columns => 'a'..'z', :from_column => 'm') }.to raise_error(ArgumentError)
+            end
+            
             it 'loads columns in reverse order with :reversed => true' do
               @cf.insert('ABC', Hash[('a'..'f').map { |a| [a, a.upcase] }.shuffle])
               @cf.get('ABC', :reversed => true).keys.should == ('a'..'f').to_a.reverse

metadata

@@ -2,7 +2,7 @@
 name: eurydice
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: java
 authors: 
   - Theo Hultberg
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-01 00:00:00 Z
+date: 2011-11-03 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: pelops-jars