gotime-cassandra_object 4.11.5 → 4.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f4ae8a2098007fdcbcd6847250f1f1a6ec7d796
-  data.tar.gz: 1f771e3e05b8fd02c75368d9bb4d267625ae65c4
+  metadata.gz: 9fcf2ed65ff6d08d1702f76e7836b583ba931efb
+  data.tar.gz: 92826ba8e10ab9bf7c5adcbd3b91e8aa4fa1b588
 SHA512:
-  metadata.gz: ba97e2ce536c92b6350a9a967276a8e75807c38b63c6e088041e29ed77110f2f5607ff9f820a5c449bc2e2445c9721548739aa3f7115e2ba8b75b6761b101756
-  data.tar.gz: ecf1f7f1eec3c482cc31df0797c044bf28505285728169e47f49ab8aa8cf33dbc29ed63bad3bec0fd6b31654eb69904592c6937c37a6a51ecca9302b50743754
+  metadata.gz: efcb74eb7565da59f852cabf98bbff6576522711baed4e7606bc176e7ff7274b77a07613cced49800566e79492b514a25eccaf1012c878db02637a8f1a6ebd50
+  data.tar.gz: 5719eb66e60d9b435869d774e6f39fa31db7a0650233626ffbcdf4899ec5c1dbef5f8cc394c6fc5f511251b2da2983ceb0aeb45e0ddeb78574acf399b11c6e84

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/adapters/abstract_adapter.rb

@@ -0,0 +1,47 @@
+module CassandraObject
+  module Adapters
+    class AbstractAdapter
+      attr_reader :config
+      def initialize(config)
+        @config = config
+      end
+
+      # === Options
+      # [:select]
+      #   Only select certain fields
+      # [:limit]
+      #   Limit the results
+      def select(ids, options ={}) # abstract
+      end
+
+      def write(id, attributes) # abstract
+      end
+
+      def delete(ids) # abstract
+      end
+
+      def execute_batch(statements) # abstract
+      end
+
+      def batching?
+        !@batch_statements.nil?
+      end
+
+      def batch
+        @batch_statements = []
+        yield
+        execute_batch(@batch_statements) if @batch_statements.any?
+      ensure
+        @batch_statements = nil
+      end
+
+      def execute_batchable(statement)
+        if @batch_statements
+          @batch_statements << statement
+        else
+          execute statement
+        end
+      end
+    end
+  end
+end

data/lib/cassandra_object/adapters/cassandra_adapter.rb

@@ -0,0 +1,158 @@
+module CassandraObject
+  module Adapters
+    class CassandraAdapter < AbstractAdapter
+      def cql
+        @cql ||= CassandraCQL::Database.new(config.servers, {keyspace: config.keyspace}, config.thrift_options)
+      end
+
+      def execute(statement)
+        ActiveSupport::Notifications.instrument("cql.cassandra_object", cql: statement) do
+          cql.execute statement
+        end
+      end
+
+      def select(statement)
+        execute(statement).fetch do |cql_row|
+          attributes = cql_row.to_hash
+          key = attributes.delete(primary_key_column)
+          yield(key, attributes) unless attributes.empty?
+        end
+      end
+
+      def build_query(scope)
+        QueryBuilder.new(self, scope).to_query
+      end
+
+      class QueryBuilder
+        def initialize(adapter, scope)
+          @adapter  = adapter
+          @scope    = scope
+        end
+
+        def to_query
+          [
+            "SELECT #{select_string} FROM #{@scope.klass.column_family}",
+            @adapter.write_option_string,
+            where_string,
+            limit_string
+          ].delete_if(&:blank?) * ' '
+        end
+
+        def select_string
+          if @scope.select_values.any?
+            (['KEY'] | @scope.select_values) * ','
+          else
+            '*'
+          end
+        end
+
+        def where_string
+          if @scope.where_values.any?
+            wheres = []
+
+            @scope.where_values.map do |where_value|
+              wheres.concat format_where_statement(where_value)
+            end
+
+            "WHERE #{wheres * ' AND '}"
+          else
+            ''
+          end
+        end
+
+        def format_where_statement(where_value)
+          if where_value.is_a?(String)
+            [where_value]
+          elsif where_value.is_a?(Hash)
+            where_value.map do |column, value|
+              if value.is_a?(Array)
+                "#{column} IN (#{escape_where_value(value)})"
+              else
+                "#{column} = #{escape_where_value(value)}"
+              end
+            end
+          end
+        end
+
+        def escape_where_value(value)
+          if value.is_a?(Array)
+            value.map { |v| escape_where_value(v) }.join(",")
+          elsif value.is_a?(String)
+            value = value.gsub("'", "''")
+            "'#{value}'"
+          else
+            value
+          end
+        end
+
+        def limit_string
+          if @scope.limit_value
+            "LIMIT #{@scope.limit_value}"
+          else
+            ""
+          end
+        end
+      end
+
+      def write(table, id, attributes)
+        if (not_nil_attributes = attributes.reject { |key, value| value.nil? }).any?
+          insert_attributes = {primary_key_column => id}.update(not_nil_attributes)
+          statement = "INSERT INTO #{table} (#{quote_columns(insert_attributes.keys) * ','}) VALUES (#{Array.new(insert_attributes.size, '?') * ','})#{write_option_string}"
+          execute_batchable sanitize(statement, *insert_attributes.values)
+        end
+
+        if (nil_attributes = attributes.select { |key, value| value.nil? }).any?
+          execute_batchable sanitize("DELETE #{quote_columns(nil_attributes.keys) * ','} FROM #{table}#{write_option_string} WHERE #{primary_key_column} = ?", id)
+        end
+      end
+
+      def delete(table, ids)
+        statement = "DELETE FROM #{table}#{write_option_string} WHERE "
+        statement += ids.is_a?(Array) ? "#{primary_key_column} IN (?)" : "#{primary_key_column} = ?"
+
+        execute_batchable sanitize(statement, ids)
+      end
+
+      def execute_batch(statements)
+        raise 'No can do' if statements.empty?
+
+        stmt = [
+          "BEGIN BATCH#{write_option_string(true)}",
+          statements * "\n",
+          'APPLY BATCH'
+        ] * "\n"
+
+        execute stmt
+      end
+
+      def consistency
+        @consistency
+      end
+
+      def consistency=(val)
+        @consistency = val
+      end
+
+      def primary_key_column
+        'KEY'
+      end
+
+      def write_option_string(ignore_batching = false)
+        if (ignore_batching || !batching?) && consistency
+          " USING CONSISTENCY #{consistency}"
+        end
+      end
+
+      private
+
+        def sanitize(statement, *bind_vars)
+          CassandraCQL::Statement.sanitize(statement, bind_vars).force_encoding(Encoding::UTF_8)
+        end
+
+        def quote_columns(column_names)
+          column_names.map { |name| "'#{name}'" }
+        end
+
+    end
+  end
+end

data/lib/cassandra_object/adapters/dynamo_adapter.rb

@@ -0,0 +1,6 @@
+module CassandraObject
+  module ConnectionAdapters
+    class Adapter < AbstractAdapter
+    end
+  end
+end

data/lib/cassandra_object/adapters/hstore_adapter.rb

@@ -0,0 +1,6 @@
+module CassandraObject
+  module ConnectionAdapters
+    class Adapter < AbstractAdapter
+    end
+  end
+end

data/lib/cassandra_object/connection.rb

@@ -24,6 +24,10 @@ module CassandraObject
         @@cql ||= CassandraCQL::Database.new(config.servers, {keyspace: config.keyspace}, config.thrift_options)
       end
 
+      def adapter
+        @@adapter ||= CassandraObject::Adapters::CassandraAdapter.new(config)
+      end
+
       def execute_cql(cql_string, *bind_vars)
         statement = CassandraCQL::Statement.sanitize(cql_string, bind_vars).force_encoding(Encoding::UTF_8)
 

data/lib/cassandra_object/consistency.rb

@@ -9,10 +9,14 @@ module CassandraObject
       ensure
         self.default_consistency = previous
       end
-    end
 
-    included do
-      class_attribute :default_consistency
+      def default_consistency=(value)
+        adapter.consistency = value
+      end
+
+      def default_consistency
+        adapter.consistency
+      end
     end
   end
 end

data/lib/cassandra_object/log_subscriber.rb

@@ -1,11 +1,26 @@
 module CassandraObject
   class LogSubscriber < ActiveSupport::LogSubscriber
+    def self.runtime=(value)
+      Thread.current["cassandra_object_request_runtime"] = value
+    end
+
+    def self.runtime
+      Thread.current["cassandra_object_request_runtime"] ||= 0
+    end
+
+    def self.reset_runtime
+      rt, self.runtime = runtime, 0
+      rt
+    end
+
     def initialize
       super
       @odd_or_even = false
     end
 
     def cql(event)
+      self.class.runtime += event.duration
+
       payload = event.payload
       name = '%s (%.1fms)' % [payload[:name], event.duration]
       cql = payload[:cql].squeeze(' ')

data/lib/cassandra_object/persistence.rb

@@ -7,15 +7,12 @@ module CassandraObject
     end
 
     module ClassMethods
-      def remove(id)
-        statement = "DELETE FROM #{column_family}#{write_option_string} WHERE "
-        statement += id.is_a?(Array) ? "KEY IN (?)" : "KEY = ?"
-
-        execute_batchable_cql statement, id
+      def remove(ids)
+        adapter.delete column_family, ids
       end
 
       def delete_all
-        execute_cql "TRUNCATE #{column_family}"
+        adapter.execute "TRUNCATE #{column_family}"
       end
 
       def create(attributes = {}, &block)
@@ -25,27 +22,15 @@ module CassandraObject
       end
 
       def write(id, attributes)
-        if (encoded = encode_attributes(attributes)).any?
-          insert_attributes = {'KEY' => id}.update(encoded)
-          statement = "INSERT INTO #{column_family} (#{quote_columns(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_batchable_cql "DELETE #{quote_columns(nil_attributes.keys) * ','} FROM #{column_family}#{write_option_string} WHERE KEY = ?", id
-        end
+        adapter.write column_family, id, encode_attributes(attributes)
       end
 
       def batching?
-        !batch_statements.nil?
+        adapter.batching?
       end
 
-      def batch
-        self.batch_statements = []
-        yield
-        execute_cql(batch_statement) if batch_statements.any?
-      ensure
-        self.batch_statements = nil
+      def batch(&block)
+        adapter.batch(&block)
       end
 
       def instantiate(id, attributes)
@@ -60,7 +45,9 @@ module CassandraObject
       def encode_attributes(attributes)
         encoded = {}
         attributes.each do |column_name, value|
-          unless value.nil?
+          if value.nil?
+            encoded[column_name] = nil
+          else
             encoded[column_name] = attribute_definitions[column_name].coder.encode(value)
           end
         end
@@ -73,24 +60,6 @@ module CassandraObject
           column_names.map { |name| "'#{name}'" }
         end
 
-        def batch_statement
-          return nil unless batch_statements.any?
-
-          [
-            "BEGIN BATCH#{write_option_string(true)}",
-            batch_statements * "\n",
-            'APPLY BATCH'
-          ] * "\n"
-        end
-
-        def execute_batchable_cql(cql_string, *bind_vars)
-          if batch_statements
-            batch_statements << CassandraCQL::Statement.sanitize(cql_string, bind_vars)
-          else
-            execute_cql cql_string, *bind_vars
-          end
-        end
-
         def typecast_persisted_attributes(object, attributes)
           attributes.each do |key, value|
             if definition = attribute_definitions[key]
@@ -108,12 +77,6 @@ module CassandraObject
 
           attributes
         end
-
-        def write_option_string(ignore_batching = false)
-          if (ignore_batching || !batching?) && base_class.default_consistency
-            " USING CONSISTENCY #{base_class.default_consistency}"
-          end
-        end
     end
 
     def new_record?

data/lib/cassandra_object/railtie.rb

@@ -3,5 +3,13 @@ module CassandraObject
     rake_tasks do
       load 'cassandra_object/tasks/ks.rake'
     end
+
+    # Expose database runtime to controller for logging.
+    initializer "cassandra_object.log_runtime" do |app|
+      require "cassandra_object/railties/controller_runtime"
+      ActiveSupport.on_load(:action_controller) do
+        include CassandraObject::Railties::ControllerRuntime
+      end
+    end
   end
 end

data/lib/cassandra_object/railties/controller_runtime.rb

@@ -0,0 +1,45 @@
+require 'active_support/core_ext/module/attr_internal'
+require 'cassandra_object/log_subscriber'
+
+module CassandraObject
+  module Railties # :nodoc:
+    module ControllerRuntime #:nodoc:
+      extend ActiveSupport::Concern
+
+      module ClassMethods # :nodoc:
+        def log_process_action(payload)
+          messages, cassandra_object_runtime = super, payload[:cassandra_object_runtime]
+          if cassandra_object_runtime.to_i > 0
+            messages << ("CassandraObject: %.1fms" % cassandra_object_runtime.to_f)
+          end
+          messages
+        end
+      end
+
+      #private
+
+        attr_internal :cassandra_object_runtime
+
+        def process_action(action, *args)
+          # We also need to reset the runtime before each action
+          # because of queries in middleware or in cases we are streaming
+          # and it won't be cleaned up by the method below.
+          CassandraObject::LogSubscriber.reset_runtime
+          super
+        end
+
+        def cleanup_view_runtime
+          runtime_before_render = CassandraObject::LogSubscriber.reset_runtime
+          runtime = super
+          runtime_after_render = CassandraObject::LogSubscriber.reset_runtime
+          self.cassandra_object_runtime = runtime_before_render + runtime_after_render
+          runtime - runtime_after_render
+        end
+
+        def append_info_to_payload(payload)
+          super
+          payload[:cassandra_object_runtime] = (cassandra_object_runtime || 0) + CassandraObject::LogSubscriber.reset_runtime
+        end
+    end
+  end
+end

data/lib/cassandra_object/scope.rb

@@ -36,21 +36,13 @@ module CassandraObject
         end
       end
 
-      def instantiate_from_cql(cql_string, *args)
+      def instantiate_from_cql(cql_string)
         results = []
-        klass.execute_cql(cql_string, *args).fetch do |cql_row|
-          results << instantiate_cql_row(cql_row)
+        klass.adapter.select(cql_string) do |key, attributes|
+          results << klass.instantiate(key, attributes)
         end
         results.compact!
         results
       end
-
-      def instantiate_cql_row(cql_row)
-        attributes = cql_row.to_hash
-        key = attributes.delete('KEY')
-        if attributes.any?
-          klass.instantiate(key, attributes)
-        end
-      end
   end
 end

data/lib/cassandra_object/scope/batches.rb

@@ -24,7 +24,7 @@ module CassandraObject
           yield records
           break if next_record.nil?
 
-          records = scope.where("KEY >= '#{next_record.id}'").to_a
+          records = scope.where("#{adapter.primary_key_column} >= '#{next_record.id}'").to_a
         end
       end
     end

data/lib/cassandra_object/scope/finder_methods.rb

@@ -24,10 +24,11 @@ module CassandraObject
       end
 
       private
+
         def find_one(id)
           if id.blank?
             raise CassandraObject::RecordNotFound, "Couldn't find #{self.name} with key #{id.inspect}"
-          elsif record = where('KEY' => id).first
+          elsif record = where(adapter.primary_key_column => id).first
             record
           else
             raise CassandraObject::RecordNotFound
@@ -40,7 +41,7 @@ module CassandraObject
 
           ids = ids.compact.map(&:to_s).uniq
 
-          where("KEY" => ids).to_a
+          where(adapter.primary_key_column => ids).to_a
         end
     end
   end

data/lib/cassandra_object/scope/query_methods.rb

@@ -33,79 +33,12 @@ module CassandraObject
       end
 
       def to_cql
-        [
-          "SELECT #{select_string} FROM #{klass.column_family}",
-          consistency_string,
-          where_string,
-          limit_string
-        ].delete_if(&:blank?) * ' '
+        adapter.build_query(self)
       end
 
       def to_a
-        instantiate_from_cql(to_cql)
+        instantiate_from_cql(adapter.build_query(self))
       end
-
-      private
-        def select_string
-          if select_values.any?
-            (['KEY'] | select_values) * ','
-          else
-            '*'
-          end
-        end
-
-        def where_string
-          if where_values.any?
-            wheres = []
-
-            where_values.map do |where_value|
-              wheres.concat format_where_statement(where_value)
-            end
-
-            "WHERE #{wheres * ' AND '}"
-          else
-            ''
-          end
-        end
-
-        def format_where_statement(where_value)
-          if where_value.is_a?(String)
-            [where_value]
-          elsif where_value.is_a?(Hash)
-            where_value.map do |column, value|
-              if value.is_a?(Array)
-                "#{column} IN (#{escape_where_value(value)})"
-              else
-                "#{column} = #{escape_where_value(value)}"
-              end
-            end
-          end
-        end
-
-        def escape_where_value(value)
-          if value.is_a?(Array)
-            value.map { |v| escape_where_value(v) }.join(",")
-          elsif value.is_a?(String)
-            value = value.gsub("'", "''")
-            "'#{value}'"
-          else
-            value
-          end
-        end
-
-        def limit_string
-          if limit_value
-            "LIMIT #{limit_value}"
-          else
-            ""
-          end
-        end
-
-        def consistency_string
-          if klass.default_consistency
-            "USING CONSISTENCY #{klass.default_consistency}"
-          end
-        end
     end
   end
 end

data/lib/gotime-cassandra_object.rb

@@ -27,14 +27,6 @@ module CassandraObject
   autoload :Type
   autoload :Validations
 
-  module BelongsTo
-    extend ActiveSupport::Autoload
-
-    autoload :Association
-    autoload :Builder
-    autoload :Reflection
-  end
-
   module AttributeMethods
     extend ActiveSupport::Autoload
 
@@ -46,6 +38,22 @@ module CassandraObject
     end
   end
 
+  module Adapters
+    extend ActiveSupport::Autoload
+
+    autoload :AbstractAdapter
+    autoload :CassandraAdapter
+    autoload :HstoreAdapter
+  end
+
+  module BelongsTo
+    extend ActiveSupport::Autoload
+
+    autoload :Association
+    autoload :Builder
+    autoload :Reflection
+  end
+
   module Types
     extend ActiveSupport::Autoload
 

data/test/unit/log_subscriber_test.rb

@@ -19,4 +19,8 @@ class CassandraObject::LogSubscriberTest < CassandraObject::TestCase
     assert_equal 1, @logger.logged(:debug).size
     assert_match "SELECT * FROM Issues", @logger.logged(:debug)[0]
   end
+
+  def test_initializes_runtime
+    Thread.new { assert_equal 0, CassandraObject::LogSubscriber.runtime }.join
+  end
 end

data/test/unit/persistence_test.rb

@@ -19,7 +19,7 @@ class CassandraObject::PersistenceTest < CassandraObject::TestCase
     )
 
     assert_equal(
-      {},
+      {'description' => nil},
       klass.encode_attributes({'description' => nil})
     )
 

data/test/unit/railties/controller_runtime_test.rb

@@ -0,0 +1,48 @@
+require 'test_helper'
+require "cassandra_object/railties/controller_runtime"
+
+class CassandraObject::Railties::ControllerRuntimeTest < MiniTest::Unit::TestCase
+  class TestRuntime
+    def self.log_process_action(payload)
+      ['sweet']
+    end
+
+    def cleanup_view_runtime
+      12
+    end
+
+    def append_info_to_payload(payload)
+      payload[:foo] = 42
+    end
+  end
+
+  class CassandraRuntime < TestRuntime
+    include CassandraObject::Railties::ControllerRuntime
+  end
+
+  def test_cleanup_view_runtime
+    runtime = CassandraRuntime.new
+    CassandraObject::LogSubscriber.runtime = 10
+
+    runtime.cleanup_view_runtime
+
+    assert_equal 0, CassandraObject::LogSubscriber.runtime
+  end
+
+  def test_append_info_to_payload
+    runtime = CassandraRuntime.new
+    payload = {}
+    runtime.append_info_to_payload(payload)
+
+    assert_equal 42, payload[:foo]
+    assert payload.key?(:cassandra_object_runtime)
+  end
+
+  def test_log_process_action
+    payload = {cassandra_object_runtime: 12.3}
+    messages = CassandraRuntime.log_process_action(payload)
+
+    assert_equal 2, messages.size
+    assert_equal "CassandraObject: 12.3ms", messages.last
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.11.5
+  version: 4.11.6
 platform: ruby
 authors:
 - Michael Koziarski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -83,6 +83,10 @@ files:
 - README.rdoc
 - Rakefile
 - gotime-cassandra_object.gemspec
+- lib/cassandra_object/adapters/abstract_adapter.rb
+- lib/cassandra_object/adapters/cassandra_adapter.rb
+- lib/cassandra_object/adapters/dynamo_adapter.rb
+- lib/cassandra_object/adapters/hstore_adapter.rb
 - lib/cassandra_object/attribute_methods.rb
 - lib/cassandra_object/attribute_methods/definition.rb
 - lib/cassandra_object/attribute_methods/dirty.rb
@@ -106,6 +110,7 @@ files:
 - lib/cassandra_object/model.rb
 - lib/cassandra_object/persistence.rb
 - lib/cassandra_object/railtie.rb
+- lib/cassandra_object/railties/controller_runtime.rb
 - lib/cassandra_object/schema.rb
 - lib/cassandra_object/schema/tasks.rb
 - lib/cassandra_object/scope.rb
@@ -153,6 +158,7 @@ files:
 - test/unit/inspect_test.rb
 - test/unit/log_subscriber_test.rb
 - test/unit/persistence_test.rb
+- test/unit/railties/controller_runtime_test.rb
 - test/unit/schema/tasks_test.rb
 - test/unit/schema_test.rb
 - test/unit/scope/batches_test.rb