gotime-cassandra_object 4.0.2 → 4.1.0

data/Gemfile

@@ -1,7 +1,4 @@
 source "http://rubygems.org"
 gemspec
 
-group :test do
-  gem 'cassandra', require: 'cassandra/1.0'
-  gem 'cassandra-cql'
-end
+gem 'rake'

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '4.0.2'
+  s.version = '4.1.0'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ["Michael Koziarski", "gotime"]
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency('activemodel', '>= 3.0')
-  s.add_runtime_dependency('cassandra', '>= 0.14.0')
   s.add_runtime_dependency('cassandra-cql')
   s.add_runtime_dependency('thrift_client', '~> 0.8.0')
 

data/lib/cassandra_object/base.rb

@@ -29,7 +29,6 @@ module CassandraObject
     extend ActiveSupport::DescendantsTracker
     
     include Connection
-    include Consistency
     include Identity
     include Inspect
     include FinderMethods

data/lib/cassandra_object/batches.rb

@@ -3,27 +3,31 @@ module CassandraObject
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def find_each
-        connection.each(column_family, count: 500) do |k, v|
-          yield instantiate(k, v)
+      def find_each(options = {})
+        find_in_batches(options) do |records|
+          records.each { |record| yield record }
         end
       end
 
       def find_in_batches(options = {})
         batch_size = options.delete(:batch_size) || 1000
+        start_key = nil
 
-        batch = []
+        statement = "select * from #{column_family} limit #{batch_size + 1}"
+        records = instantiate_from_cql statement
 
-        find_each do |record|
-          batch << record
-          if batch.size == batch_size
-            yield(batch)
-            batch = []
+        while records.any?
+          if records.size > batch_size
+            next_record = records.pop
+          else
+             next_record = nil
           end
-        end
 
-        if batch.size > 0
-          yield batch
+          yield records
+          break if next_record.nil?
+
+          statement = "SELECT * FROM #{column_family} WHERE KEY >= ? LIMIT #{batch_size + 1}"
+          records = instantiate_from_cql statement, next_record.id
         end
       end
     end

data/lib/cassandra_object/connection.rb

@@ -33,12 +33,8 @@ module CassandraObject
         self.connection_config = spec.reverse_merge(DEFAULT_OPTIONS)
       end
 
-      def connection
-        @@connection ||= Cassandra.new(connection_config[:keyspace], connection_config[:servers], connection_config[:thrift].symbolize_keys)
-      end
-
       def cql
-        @@cql ||= CassandraCQL::Database.new(connection_config[:servers], keyspace: connection_config[:keyspace], connection_config[:thrift].symbolize_keys)
+        @@cql ||= CassandraCQL::Database.new(connection_config[:servers], {keyspace: connection_config[:keyspace]}, connection_config[:thrift].symbolize_keys)
       end
 
       def execute_cql(cql_string, *bind_vars)

data/lib/gotime-cassandra_object.rb

@@ -9,7 +9,6 @@ module CassandraObject
   autoload :Connection
   autoload :AttributeMethods
   autoload :BelongsTo
-  autoload :Consistency
   autoload :Persistence
   autoload :Callbacks
   autoload :Validations

data/test/unit/connection_test.rb

@@ -9,23 +9,22 @@ class CassandraObject::ConnectionTest < CassandraObject::TestCase
   end
 
   test 'establish_connection' do
-    # TestObject.establish_connection(
-    #   keyspace: 'place_directory_development',
-    #   servers: '192.168.0.100:9160',
-    #   thrift: {'timeout' => 10}
-    # )
+    TestObject.establish_connection(
+      keyspace: 'place_directory_development',
+      servers: '192.168.0.100:9160',
+      thrift: {'timeout' => 10}
+    )
     # 
-    # assert_equal 'place_directory_development', TestObject.connection.keyspace
-    # assert_equal ["192.168.0.100:9160"], TestObject.connection.servers
-    # assert_equal 10, TestObject.connection.thrift_client_options[:timeout]
+    assert_equal 'place_directory_development', TestObject.connection_config[:keyspace]
+    assert_equal 10, TestObject.connection_config[:thrift]['timeout']
   end
 
   test 'establish_connection defaults' do
-    # TestObject.establish_connection(
-    #   keyspace: 'place_directory_development'
-    # )
+    TestObject.establish_connection(
+      keyspace: 'place_directory_development'
+    )
     # 
     # assert_equal 'place_directory_development', TestObject.connection.keyspace
-    # assert_equal ["127.0.0.1:9160"], TestObject.connection.servers
+    assert_equal "127.0.0.1:9160", TestObject.connection_config[:servers]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -28,22 +28,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: cassandra
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: cassandra-cql
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +105,6 @@ files:
 - lib/cassandra_object/belongs_to/reflection.rb
 - lib/cassandra_object/callbacks.rb
 - lib/cassandra_object/connection.rb
-- lib/cassandra_object/consistency.rb
 - lib/cassandra_object/errors.rb
 - lib/cassandra_object/finder_methods.rb
 - lib/cassandra_object/identity.rb
@@ -163,7 +146,6 @@ files:
 - test/unit/belongs_to_test.rb
 - test/unit/callbacks_test.rb
 - test/unit/connection_test.rb
-- test/unit/consistency_test.rb
 - test/unit/finder_methods_test.rb
 - test/unit/identity_test.rb
 - test/unit/inspect_test.rb

data/lib/cassandra_object/consistency.rb

@@ -1,31 +0,0 @@
-module CassandraObject
-  module Consistency
-    extend ActiveSupport::Concern
-
-    included do
-      cattr_accessor :consistency_levels
-      self.consistency_levels = [:one, :quorum, :all]
-
-      class_attribute :write_consistency
-      class_attribute :read_consistency
-      self.write_consistency  = :quorum
-      self.read_consistency   = :quorum
-    end
-
-    module ClassMethods
-      THRIFT_LEVELS = {
-        one:    Cassandra::Consistency::ONE,
-        quorum: Cassandra::Consistency::QUORUM,
-        all:    Cassandra::Consistency::ALL
-      }
-
-      def thrift_read_consistency
-        THRIFT_LEVELS[read_consistency] || (raise "Invalid consistency level #{read_consistency}")
-      end
-
-      def thrift_write_consistency
-        THRIFT_LEVELS[write_consistency] || (raise "Invalid consistency level #{write_consistency}")
-      end
-    end
-  end
-end

data/test/unit/consistency_test.rb

@@ -1,20 +0,0 @@
-require 'test_helper'
-
-class CassandraObject::ConsistencyTest < CassandraObject::TestCase
-  class TestModel < CassandraObject::Base
-  end
-
-  test 'consistency_levels' do
-    assert_equal [:one, :quorum, :all].to_set, TestModel.consistency_levels.to_set
-  end
-
-  test 'thrift_write_consistency' do
-    TestModel.write_consistency = :all
-    assert_equal Cassandra::Consistency::ALL, TestModel.thrift_write_consistency
-  end
-  
-  test 'thrift_read_consistency' do
-    TestModel.read_consistency = :all
-    assert_equal Cassandra::Consistency::ALL, TestModel.thrift_read_consistency
-  end
-end