gotime-cassandra_object 4.4.3 → 4.4.4

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '4.4.3'
+  s.version = '4.4.4'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ["Michael Koziarski", "gotime"]

data/lib/cassandra_object/persistence.rb

@@ -4,7 +4,7 @@ module CassandraObject
 
     module ClassMethods
       def remove(id)
-        execute_cql "DELETE FROM #{column_family} #{write_option_string} WHERE KEY = ?", id
+        execute_batchable_cql "DELETE FROM #{column_family}#{write_option_string} WHERE KEY = ?", id
       end
 
       def delete_all
@@ -20,15 +20,33 @@ module CassandraObject
       def write(id, attributes)
         if (encoded = encode_attributes(attributes)).any?
           insert_attributes = {'KEY' => id}.update encode_attributes(attributes)
-          statement = "INSERT INTO #{column_family} (#{insert_attributes.keys * ','}) VALUES (#{Array.new(insert_attributes.size, '?') * ','}) #{write_option_string}"
-          execute_cql statement, *insert_attributes.values
+          statement = "INSERT INTO #{column_family} (#{insert_attributes.keys * ','}) VALUES (#{Array.new(insert_attributes.size, '?') * ','})#{write_option_string}"
+          execute_batchable_cql statement, *insert_attributes.values
         end
 
         if (nil_attributes = attributes.select { |key, value| value.nil? }).any?
-          execute_cql "DELETE #{nil_attributes.keys * ','} FROM #{column_family} #{write_option_string} WHERE KEY = ?", id
+          execute_batchable_cql "DELETE #{nil_attributes.keys * ','} FROM #{column_family}#{write_option_string} WHERE KEY = ?", id
         end
       end
 
+      def batch
+        @batch = []
+
+        with_consistency nil do
+          yield
+        end
+
+        if @batch.any?
+          execute_cql [
+            "BEGIN BATCH#{write_option_string}",
+            @batch * "\n",
+            'APPLY BATCH'
+          ] * "\n"
+        end
+      ensure
+        @batch = nil
+      end
+
       def instantiate(id, attributes)
         allocate.tap do |object|
           object.instance_variable_set("@id", id) if id
@@ -41,7 +59,6 @@ module CassandraObject
       def encode_attributes(attributes)
         encoded = {}
         attributes.each do |column_name, value|
-          # The ruby thrift gem expects all strings to be encoded as ascii-8bit.
           unless value.nil?
             encoded[column_name.to_s] = attribute_definitions[column_name.to_sym].coder.encode(value)
           end
@@ -49,18 +66,25 @@ module CassandraObject
         encoded
       end
 
-      def typecast_attributes(object, attributes)
-        attributes = attributes.symbolize_keys
-        Hash[attribute_definitions.map { |k, attribute_definition| [k.to_s, attribute_definition.instantiate(object, attributes[k])] }]
-      end
-
       private
-      def write_option_string
-        consistency = base_class.default_consistency
-        if consistency
-          "USING CONSISTENCY #{consistency}"
+        def execute_batchable_cql(cql_string, *bind_vars)
+          if @batch
+            @batch << CassandraCQL::Statement.sanitize(cql_string, bind_vars)
+          else
+            execute_cql cql_string, *bind_vars
+          end
+        end
+      
+        def typecast_attributes(object, attributes)
+          attributes = attributes.symbolize_keys
+          Hash[attribute_definitions.map { |k, attribute_definition| [k.to_s, attribute_definition.instantiate(object, attributes[k])] }]
+        end
+
+        def write_option_string
+          if base_class.default_consistency
+            " USING CONSISTENCY #{base_class.default_consistency}"
+          end
         end
-      end
     end
 
     def new_record?

data/lib/cassandra_object/scope.rb

@@ -41,7 +41,7 @@ module CassandraObject
         attributes = cql_row.to_hash
         key = attributes.delete('KEY')
         if attributes.any?
-          instantiate(key, attributes)
+          klass.instantiate(key, attributes)
         end
       end
   end

data/test/support/connect.rb

@@ -1,6 +1,7 @@
 CassandraObject::Base.establish_connection(
   keyspace: 'cassandra_object_test',
-  servers: '127.0.0.1:9160'
+  servers: '127.0.0.1:9160',
+  thrift: {timeout: 200}
 )
 
 begin
@@ -8,5 +9,7 @@ begin
 rescue Exception => e
 end
 
+sleep 1
 CassandraObject::Schema.create_keyspace 'cassandra_object_test'
-CassandraObject::Schema.create_column_family 'Issues'
+CassandraObject::Schema.create_column_family 'Issues'
+CassandraObject::Base.default_consistency = 'QUORUM'

data/test/support/teardown.rb

@@ -7,7 +7,12 @@ CassandraObject::Base.class_eval do
   end
 
   def self.delete_after_test
-    created_records.reject(&:destroyed?).each(&:destroy)
+    # created_records.reject(&:destroyed?).each(&:destroy)
+    cql = CassandraCQL::Database.new(connection_config.servers, {keyspace: connection_config.keyspace}, connection_config.thrift_options)
+    begin
+      cql.execute "TRUNCATE Issues"
+    rescue
+    end
     created_records.clear
   end
 end
@@ -16,8 +21,8 @@ module ActiveSupport
   class TestCase
     teardown do
       if CassandraObject::Base.created_records.any?
-        Issue.delete_all
+        CassandraObject::Base.delete_after_test
       end
     end
   end
-end
+end

data/test/unit/consistency_test.rb

@@ -2,12 +2,12 @@ require "test_helper"
 
 class CassandraObject::ConsistencyTest < CassandraObject::TestCase
   test "with_consistency" do
-    assert_nil CassandraObject::Base.default_consistency
+    original = CassandraObject::Base.default_consistency
 
-    CassandraObject::Base.with_consistency 'QUORUM' do
-      assert_equal 'QUORUM', CassandraObject::Base.default_consistency
+    CassandraObject::Base.with_consistency 'LOL' do
+      assert_equal 'LOL', CassandraObject::Base.default_consistency
     end
 
-    assert_nil CassandraObject::Base.default_consistency
+    assert_equal original, CassandraObject::Base.default_consistency
   end
 end

data/test/unit/log_subscriber_test.rb

@@ -1,6 +1,22 @@
 require "test_helper"
 require "active_support/log_subscriber/test_helper"
+require "cassandra_object/log_subscriber"
 
 class CassandraObject::LogSubscriberTest < CassandraObject::TestCase
   include ActiveSupport::LogSubscriber::TestHelper
+
+  def setup
+    super
+
+    CassandraObject::LogSubscriber.attach_to :cassandra_object
+  end
+
+  def test_cql_notification
+    Issue.execute_cql "SELECT * FROM Issues"
+
+    wait
+
+    assert_equal 1, @logger.logged(:debug).size
+    assert_match "SELECT * FROM Issues", @logger.logged(:debug)[0]
+  end
 end

data/test/unit/persistence_test.rb

@@ -22,6 +22,21 @@ class CassandraObject::PersistenceTest < CassandraObject::TestCase
     )
   end
 
+  test "batch" do
+    first_issue = second_issue = nil
+
+    Issue.batch do
+      first_issue = Issue.create
+      second_issue = Issue.create
+
+      assert_raise(CassandraObject::RecordNotFound) { Issue.find first_issue.id }
+      assert_raise(CassandraObject::RecordNotFound) { Issue.find second_issue.id }
+    end
+
+    assert_nothing_raised(CassandraObject::RecordNotFound) { Issue.find first_issue.id }
+    assert_nothing_raised(CassandraObject::RecordNotFound) { Issue.find second_issue.id }
+  end
+
   test 'persistance inquiries' do
     issue = Issue.new
     assert issue.new_record?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.4.3
+  version: 4.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -135,8 +135,6 @@ files:
 - lib/cassandra_object/types/time_type.rb
 - lib/cassandra_object/validations.rb
 - lib/gotime-cassandra_object.rb
-- test/performance/insert_test.rb
-- test/performance_helper.rb
 - test/support/connect.rb
 - test/support/issue.rb
 - test/support/teardown.rb

data/test/performance/insert_test.rb

@@ -1,14 +0,0 @@
-
-# class BigIssue < CassandraObject::Base
-#   self.column_family = 'Issues'
-# 
-#   1.upto(400) do |i|
-#     string "foo_#{i}"
-#   end
-# end
-# 
-# class SmallIssue
-#   self.column_family = 'Issues'
-# 
-#   string :foo
-# end

data/test/performance_helper.rb

@@ -1,8 +0,0 @@
-require 'bundler/setup'
-require 'minitest/autorun'
-Bundler.require(:default, :test)
-
-module CassandraObject
-  class PerformanceTest < ActiveSupport::TestCase
-  end
-end