datastax_rails 2.0.18 → 2.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19e0c7c773fb3991c35ee3c5a4f76ec967d9041c
-  data.tar.gz: 4a5033007b3009ea785e38935f0d0a7c5a6eb410
+  metadata.gz: 46adde0cefb47aa5fc3affe6dbd16645d8357050
+  data.tar.gz: 9664ee5c527d05bc1020d9bae17898fd386f319e
 SHA512:
-  metadata.gz: f3ead232f919376053a15e813cec9d08630ff7ae4414300590ff2b8500077b9c6622a5347dec3d2ce5f25e22a528df05399843d8eff6587ef24df14ba1cc7be1
-  data.tar.gz: 4f620b9de99f047c114386357424cd1516432f81a45c1c3d446d31343712cd67c4396f46d2dab624b75361026dd58905982553540e8872c8bed9d06a3b98eac5
+  metadata.gz: fa9d465f640a3d72fbf096868b22976a56d39699005c1fbf656dc7394c26567fcc21570f0c8f27260d5a42f5053c308159a1baaeb07f8b752e200cfce85a12a7
+  data.tar.gz: 81221cc2ccf7b287a8842df07c839622d2ac7bd1f605c8042d5360e34c35ee8038b8eecbea1e771ca42d69c7854fe73c1442bbb4aac900cedc8fc93c120d36ad

data/config/solrconfig.xml.erb

@@ -47,7 +47,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
     -->
-  <luceneMatchVersion>LUCENE_40</luceneMatchVersion>
+  <luceneMatchVersion>LUCENE_43</luceneMatchVersion>
   
   <!-- Enable DSE Search new type mappings -->
   <dseTypeMappingVersion>2</dseTypeMappingVersion>
@@ -336,30 +336,30 @@
                and old cache.  
       -->
     <filterCache class="solr.FastLRUCache"
-                 size="512"
-                 initialSize="512"
+                 size="256"
+                 initialSize="0"
                  autowarmCount="0"/>
 
     <!-- Query Result Cache
          
          Caches results of searches - ordered lists of document ids
          (DocList) based on a query, a sort, and the range of documents requested.  
-      -->
     <queryResultCache class="solr.LRUCache"
                      size="512"
                      initialSize="512"
                      autowarmCount="0"/>
+      -->
    
     <!-- Document Cache
 
          Caches Lucene Document objects (the stored fields for each
          document).  Since Lucene internal document ids are transient,
          this cache will not be autowarmed.  
-      -->
     <documentCache class="solr.LRUCache"
                    size="512"
                    initialSize="512"
                    autowarmCount="0"/>
+      -->
     
     <!-- Field Value Cache
          
@@ -761,7 +761,7 @@
        requires: -H 'Content-type:text/xml; charset=utf-8'
     -->
   <requestHandler name="/update" 
-                  class="solr.XmlUpdateRequestHandler">
+                  class="solr.UpdateRequestHandler">
     <!-- See below for information on defining 
          updateRequestProcessorChains that can be used by name 
          on each Update Request
@@ -776,7 +776,7 @@
        http://wiki.apache.org/solr/javabin
     -->
   <requestHandler name="/update/javabin" 
-                  class="solr.BinaryUpdateRequestHandler" />
+                  class="solr.UpdateRequestHandler" />
 
   <!-- CSV Update Request Handler
        http://wiki.apache.org/solr/UpdateCSV

data/lib/datastax_rails/associations/collection_association.rb

@@ -29,7 +29,7 @@ module DatastaxRails
         if !find_target? || loaded?
           target.size
         elsif !loaded? && target.is_a?(Array)
-          unsaved_records = target.select { |r| r.new_record? }
+          unsaved_records = target.select(&:new_record?)
           unsaved_records.size + scoped.count
         else
           scoped.count
@@ -75,8 +75,8 @@ module DatastaxRails
 
       # Implements the ids writer method, e.g. foo.item_ids= for Foo.has_many :items
       def ids_writer(ids)
-        ids = Array.wrap(ids).reject { |id| id.blank? }
-        replace(klass.find(ids).index_by { |r| r.id }.values_at(*ids))
+        ids = Array.wrap(ids).reject(&:blank?)
+        replace(klass.find(ids).index_by(&:id).values_at(*ids))
       end
 
       def reset
@@ -274,7 +274,7 @@ module DatastaxRails
       def delete_or_destroy(records, method)
         records = records.flatten
         records.each { |record| raise_on_type_mismatch(record) }
-        existing_records = records.reject { |r| r.new_record? }
+        existing_records = records.reject(&:new_record?)
 
         records.each { |record| callback(:before_remove, record) }
 

data/lib/datastax_rails/associations/has_many_association.rb

@@ -40,7 +40,7 @@ module DatastaxRails
       # Deletes the records according to the <tt>:dependent</tt> option.
       def delete_records(records, method)
         if method == :destroy
-          records.each { |r| r.destroy }
+          records.each(&:destroy)
         else
           keys = records.map { |r| r[reflection.association_primary_key] }
           scope = scoped.where(reflection.association_primary_key => keys)

data/lib/datastax_rails/attribute_methods/dirty.rb

@@ -13,7 +13,11 @@ module DatastaxRails
       # Attempts to +save+ the record and clears changed attributes if successful.
       def save(*) #:nodoc:
         if (status = super)
+          # FIXME: This dup/replace mess is here to work around what APPEARS to be a bug in Rails
+          # See Issue #29 for details
+          attrs = @attributes.dup
           @previously_changed = changes
+          @attributes = attrs
           @changed_attributes.clear
         end
         status
@@ -22,7 +26,9 @@ module DatastaxRails
       # Attempts to <tt>save!</tt> the record and clears changed attributes if successful.
       def save!(*) #:nodoc:
         super.tap do
+          attrs = @attributes.dup
           @previously_changed = changes
+          @attributes = attrs
           @changed_attributes.clear
         end
       end

data/lib/datastax_rails/attribute_methods/primary_key.rb

@@ -14,7 +14,7 @@ module DatastaxRails
 
       # Returns a primary key hash for updates. Wide models override this.
       def id_for_update
-        { self.class.primary_key.to_s => id }
+        { self.class.primary_key.to_s => __id }
       end
 
       # Returns the primary key value.
@@ -22,6 +22,10 @@ module DatastaxRails
         read_attribute(self.class.primary_key)
       end
 
+      def __id
+        self.class.column_for_attribute(self.class.primary_key).type_cast_for_cql3(id)
+      end
+
       # Sets the primary key value.
       def id=(value)
         write_attribute(self.class.primary_key, value) if self.class.primary_key
@@ -81,6 +85,10 @@ module DatastaxRails
           @primary_key        = value && value.to_s
           @quoted_primary_key = nil
         end
+
+        def next_key
+          ::Cql::TimeUuid::Generator.new.next.to_s
+        end
       end
     end
   end

data/lib/datastax_rails/attribute_methods/read.rb

@@ -16,13 +16,13 @@ module DatastaxRails
         # with expensive conversion methods, like time related columns (e.g.
         # +created_at+, +updated_at+).
         def cache_attributes(*attribute_names)
-          cached_attributes.merge attribute_names.map { |attr| attr.to_s }
+          cached_attributes.merge attribute_names.map(&:to_s)
         end
 
         # Returns the attributes which are cached. By default time related columns
         # with datatype <tt>:datetime, :timestamp, :time, :date</tt> are cached.
         def cached_attributes
-          @cached_attributes ||= columns.select { |c| cacheable_column?(c) }.map { |col| col.name }.to_set
+          @cached_attributes ||= columns.select { |c| cacheable_column?(c) }.map(&:name).to_set
         end
 
         # Returns +true+ if the provided attribute is being cached.

data/lib/datastax_rails/attribute_methods/typecasting.rb

@@ -14,9 +14,6 @@ module DatastaxRails
         self.readonly_attributes = []
       end
 
-      # This is a hook for use by modules that need to do extra stuff to
-      # attributes when they are initialized. (e.g. attribute
-      # serialization)
       def initialize_attributes(attributes) #:nodoc:
         attrs = {}
         attributes.each do |k, v|
@@ -89,11 +86,13 @@ module DatastaxRails
         #   @macro attr_doc
         # @!method datetime(name, options = {})
         #   @macro attr_doc
+        # @!method double(name, options = {})
+        #   @macro attr_doc
         # @!method float(name, options = {})
         #   @macro attr_doc
         # @!method integer(name, options = {})
         #   @macro attr_doc
-        # @!method json(name, options = {})
+        # @!method long(name, options = {})
         #   @macro attr_doc
         # @!method string(name, options = {})
         #   @macro attr_doc
@@ -103,8 +102,6 @@ module DatastaxRails
         #   @macro attr_doc
         # @!method timestamp(name, options = {})
         #   @macro attr_doc
-        # @!method time_with_zone(name, options = {})
-        #   @macro attr_doc
         # @!method uuid(name, options = {})
         #   @macro attr_doc
         # @!method map(name, options = {})
@@ -115,7 +112,7 @@ module DatastaxRails
         #   @macro attr_doc
 
         # The following sets up a bunch of nearly identical attribute methods
-        %w(array boolean date datetime float integer json string text time timestamp time_with_zone
+        %w(array boolean date datetime double float integer long string text time timestamp
            uuid map set list).each do |type|
           class_eval <<-EOV, __FILE__, __LINE__ + 1
             def #{type}(name, options = {})                        # def string(name, options = {})

data/lib/datastax_rails/attribute_methods.rb

@@ -142,6 +142,31 @@ module DatastaxRails
       self.class.column_for_attribute(name)
     end
 
+    # Returns an <tt>#inspect</tt>-like string for the value of the
+    # attribute +attr_name+. String attributes are truncated upto 50
+    # characters, and Date and Time attributes are returned in the
+    # <tt>:db</tt> format. Other attributes return the value of
+    # <tt>#inspect</tt> without modification.
+    #
+    #   person = Person.create!(name: 'David Heinemeier Hansson ' * 3)
+    #
+    #   person.attribute_for_inspect(:name)
+    #   # => "\"David Heinemeier Hansson David Heinemeier Hansson D...\""
+    #
+    #   person.attribute_for_inspect(:created_at)
+    #   # => "\"2012-10-22 00:15:07\""
+    def attribute_for_inspect(attr_name)
+      value = read_attribute(attr_name)
+
+      if value.is_a?(String) && value.length > 50
+        "#{value[0..50]}...".inspect
+      elsif value.is_a?(Date) || value.is_a?(Time)
+        %("#{value.to_s(:db)}")
+      else
+        value.inspect
+      end
+    end
+
     protected
 
     def attribute_method?(name)

data/lib/datastax_rails/autosave_association.rb

@@ -255,9 +255,9 @@ module DatastaxRails
       if new_record
         association && association.target
       elsif autosave
-        association.target.select { |record| record.changed_for_autosave? }
+        association.target.select(&:changed_for_autosave?)
       else
-        association.target.select { |record| record.new_record? }
+        association.target.select(&:new_record?)
       end
     end
 
@@ -266,7 +266,7 @@ module DatastaxRails
     def nested_records_changed_for_autosave?
       self.class.reflect_on_all_autosave_associations.any? do |reflection|
         association = association_instance_get(reflection.name)
-        association && Array.wrap(association.target).any? { |a| a.changed_for_autosave? }
+        association && Array.wrap(association.target).any?(&:changed_for_autosave?)
       end
     end
 

data/lib/datastax_rails/base.rb

@@ -37,9 +37,11 @@ module DatastaxRails #:nodoc:
   # * binary - a large object that will not be indexed into SOLR (e.g., BLOB)
   # * boolean - true/false values
   # * date - a date without a time component
-  # * float - a number in floating point notation
-  # * integer - a whole, round number of any size
+  # * double - a 64-bit number in floating point notation
+  # * float - a 32-bit number in floating point notation
+  # * integer - a 32-bit signed integer
   # * list - an ordered list of values of a single type
+  # * long - a 64-bit signed integer
   # * map - a collection of key/value pairs of a single type (keys are always strings)
   # * set - an un-ordered set of unique values of a single type
   # * string - a generic string type that is not tokenized by default
@@ -366,10 +368,6 @@ module DatastaxRails #:nodoc:
     include Serialization
     include SolrRepair
 
-    # Stores the default scope for the class
-    class_attribute :default_scopes, instance_writer: false
-    self.default_scopes = []
-
     # Stores the connection configuration information
     class_attribute :config
 
@@ -397,6 +395,14 @@ module DatastaxRails #:nodoc:
     # are stored on the same row.
     class_attribute :cluster_by
 
+    # Toggle Solr query logging on and off
+    class_attribute :log_solr_queries
+    self.log_solr_queries = ENV['DEBUG_SOLR']
+
+    # Toggle CQL query logging on and off
+    class_attribute :log_cql_queries
+    self.log_cql_queries = ENV['DEBUG_CQL']
+
     attr_reader :attributes
     attr_reader :loaded_attributes
     attr_accessor :key
@@ -468,8 +474,8 @@ module DatastaxRails #:nodoc:
       # Intentionally avoid using #column_defaults since overridden defaults
       # won't get written unless they get marked as changed
       self.class.columns.each do |c|
-        attr, orig_value = c.name, c.default
-        @changed_attributes[attr] = nil if _field_changed?(attr, orig_value, @attributes[attr])
+        attr, orig_value = c.name, c.empty_value
+        @changed_attributes[attr] = nil if _field_changed?(attr, orig_value, @attributes[attr.to_s])
       end
     end
 
@@ -484,6 +490,22 @@ module DatastaxRails #:nodoc:
       @attributes.frozen?
     end
 
+    # Returns the contents of the record as a nicely formatted string.
+    def inspect
+      # We check defined?(@attributes) not to issue warnings if the object is
+      # allocated but not initialized.
+      inspection = if defined?(@attributes) && @attributes
+                     self.class.column_names.map do |name|
+                       if has_attribute?(name)
+                         "#{name}: #{attribute_for_inspect(name)}"
+                       end
+                     end.compact.join(', ')
+                   else
+                     'not initialized'
+                   end
+      "#<#{self.class} #{inspection}>"
+    end
+
     def to_param
       id.to_s if persisted?
     end
@@ -547,7 +569,7 @@ module DatastaxRails #:nodoc:
       end
 
       def models
-        descendants.reject { |m|m.abstract_class? }
+        descendants.reject(&:abstract_class?)
       end
 
       def payload_model?
@@ -576,7 +598,7 @@ module DatastaxRails #:nodoc:
 
       # Returns an array of attribute names as strings
       def attribute_names
-        @attribute_names ||= attribute_definitions.keys.map { |a|a.to_s }
+        @attribute_names ||= attribute_definitions.keys.map(&:to_s)
       end
       alias_method :column_names, :attribute_names
 
@@ -601,7 +623,7 @@ module DatastaxRails #:nodoc:
 
       def search_ids(&block)
         search = solr_search(&block)
-        search.raw_results.map { |result| result.primary_key }
+        search.raw_results.map(&:primary_key)
       end
 
       def valid_consistency?(level) #:nodoc:

data/lib/datastax_rails/column.rb

@@ -51,7 +51,7 @@ module DatastaxRails
           multi_valued: false, sortable: false,
           tokenized: false,    fulltext: false,
           cql_index: false }
-      when :boolean, :date, :time, :timestamp, :datetime, :float, :integer, :uuid then
+      when :boolean, :date, :time, :timestamp, :datetime, :float, :integer, :uuid, :long, :double then
         { solr_index: true,    solr_store: true,
           multi_valued: false, sortable: true,
           tokenized: false,    fulltext: false,
@@ -78,7 +78,7 @@ module DatastaxRails
 
     # Returns +true+ if the column is either of type integer, float or decimal.
     def number?
-      [:decimal, :double, :float, :integer].include?(type)
+      [:double, :float, :integer, :long].include?(type)
     end
 
     # Returns +true+ if the column is of type binary
@@ -94,12 +94,16 @@ module DatastaxRails
       default.present?
     end
 
+    def empty_value
+      extract_default(nil)
+    end
+
     # Returns the Ruby class that corresponds to the abstract data type.
     def klass
       case type
-      when :integer                        then Fixnum
+      when :integer, :long                 then Fixnum
       when :float                          then Float
-      when :decimal, :double               then BigDecimal
+      when :double                         then BigDecimal
       when :timestamp, :time, :datetime    then Time
       when :date                           then Date
       when :text, :string, :binary, :ascii then String
@@ -113,6 +117,7 @@ module DatastaxRails
 
     # Casts value (which can be a String) to an appropriate instance.
     def type_cast(value, record = nil, dest_type = nil) # rubocop:disable Style/CyclomaticComplexity
+      value = @default if value.nil?
       return nil if value.nil?
       return coder.load(value) if encoded?
 
@@ -121,7 +126,7 @@ module DatastaxRails
       case dest_type || type
       when :string, :text        then value.to_s
       when :ascii                then value.force_encoding('ascii')
-      when :integer              then klass.value_to_integer(value)
+      when :integer, :long       then klass.value_to_integer(value)
       when :float                then value.to_f
       when :decimal              then klass.value_to_decimal(value)
       when :datetime, :timestamp then klass.string_to_time(value)
@@ -129,8 +134,11 @@ module DatastaxRails
       when :date                 then klass.value_to_date(value)
       when :binary               then klass.binary_to_string(value)
       when :boolean              then klass.value_to_boolean(value)
-      when :uuid, :timeuuid      then klass.value_to_uuid(value)
-      when :list, :set           then wrap_collection(value.map { |v| type_cast(v, record, @options[:holds]) }, record)
+      when :uuid, :timeuuid
+        uuid = klass.value_to_uuid(value)
+        uuid.is_a?(::Cql::Uuid) ? uuid.to_s : uuid
+      when :list, :set
+        wrap_collection(Array(value).map { |v| type_cast(v, record, @options[:holds]) }.reject(&:blank?), record)
       when :map
         wrap_collection(value.each { |k, v| value[k] = type_cast(v, record, @options[:holds]) }.stringify_keys, record)
       else value
@@ -172,6 +180,7 @@ module DatastaxRails
       when :date, :time, :datetime, :timestamp then value.to_time.utc.strftime(Format::SOLR_TIME_FORMAT)
       when :list, :set                         then list_to_solr_value(value)
       when :map                                then map_to_solr_value(value)
+      when :uuid, :timeuuid                    then value.to_s
       else value
       end
     end
@@ -202,12 +211,12 @@ module DatastaxRails
     end
 
     def extract_default(default)
-      case type
-      when :map      then {} # lambda {|rec| DatastaxRails::Types::DynamicMap.new(rec, self.name.to_s, {})}
-      when :list     then [] # lambda {|rec| DatastaxRails::Types::DynamicList.new(rec, self.name.to_s, [])}
-      when :set      then Set.new # lambda {|set| DatastaxRails::Types::DynamicSet.new(rec, self.name.to_s, Set.new)}
-      else default
-      end
+      default || case type
+                 when :map      then {}
+                 when :list     then []
+                 when :set      then Set.new
+                 else default
+                 end
     end
 
     # Used to convert from Strings to BLOBs
@@ -282,12 +291,13 @@ module DatastaxRails
         when TrueClass, FalseClass
           value ? 1 : 0
         else
-          value.to_i rescue nil
+          value.blank? ? nil : value.to_i rescue nil
         end
       end
 
       # convert something to a BigDecimal
       def value_to_decimal(value)
+        return nil if value.blank?
         # Using .class is faster than .is_a? and
         # subclasses of BigDecimal will be handled
         # in the else clause
@@ -374,6 +384,7 @@ module DatastaxRails
       options[:cql_type] ||
       case field_type.to_sym
       when :integer                            then 'int'
+      when :long                               then 'bigint'
       when :time, :date, :timestamp, :datetime then 'timestamp'
       when :binary                             then 'blob'
       when :list                               then "list<#{compute_cql_type(options[:holds], options)}>"
@@ -388,7 +399,6 @@ module DatastaxRails
       options[:solr_type] ||
       case field_type.to_sym
       when :integer                            then 'int'
-      when :decimal                            then 'double'
       when :timestamp, :time, :datetime        then 'date'
       when :list, :set, :map                   then compute_solr_type(options[:holds], options)
       else field_type.to_s

data/lib/datastax_rails/connection.rb

@@ -110,7 +110,7 @@ module DatastaxRails
         end
         self.connection = ::Cql::Client.connect(cql_options)
       end
-      
+
       def ssl_type
         return false unless DatastaxRails::Base.config && DatastaxRails::Base.config[:ssl]
         config = DatastaxRails::Base.config

data/lib/datastax_rails/cql/base.rb

@@ -4,6 +4,7 @@ module DatastaxRails
     class Base
       # Base initialize that sets the default consistency.
       def initialize(klass, *_args)
+        @klass = klass
         @consistency = klass.default_consistency.to_s.downcase.to_sym
         @keyspace = DatastaxRails::Base.config[:keyspace]
         @values = []
@@ -24,25 +25,36 @@ module DatastaxRails
       # already been set up (Rails does this for you).
       def execute
         cql = to_cql
-        puts cql if ENV['DEBUG_CQL'] == 'true'
-        pp @values if ENV['DEBUG_CQL'] == 'true'
-        digest = Digest::MD5.digest cql
-        try_again = true
-        begin
-          stmt = DatastaxRails::Base.statement_cache[digest] ||= DatastaxRails::Base.connection.prepare(cql)
-          if @consistency
-            stmt.execute(*@values, consistency: @consistency)
-          else
-            stmt.execute(*@values)
-          end
-        rescue ::Cql::NotConnectedError
-          if try_again
-            Rails.logger.warn('Lost connection to Cassandra. Attempting to reconnect...')
-            try_again = false
-            DatastaxRails::Base.reconnect
-            retry
-          else
-            raise
+        ActiveSupport::Notifications.instrument(
+           'cql.datastax_rails',
+           name:           'CQL',
+           cql:            cql,
+           klass:          @klass,
+           connection_id:  DatastaxRails::Base.connection.object_id,
+           statement_name: self.class.name,
+           binds:          @values) do |payload|
+
+          digest = Digest::MD5.digest cql
+          try_again = true
+          begin
+            DatastaxRails::Base.reconnect unless DatastaxRails::Base.connection
+            stmt = DatastaxRails::Base.statement_cache[digest] ||= DatastaxRails::Base.connection.prepare(cql)
+            if @consistency
+              results = stmt.execute(*@values, consistency: @consistency)
+            else
+              results = stmt.execute(*@values)
+            end
+            payload[:result_count] = results.respond_to?(:count) ? results.count : 'No'
+            results
+          rescue ::Cql::NotConnectedError
+            if try_again
+              Rails.logger.warn('Lost connection to Cassandra. Attempting to reconnect...')
+              try_again = false
+              DatastaxRails::Base.reconnect
+              retry
+            else
+              raise
+            end
           end
         end
       end

data/lib/datastax_rails/cql/select.rb

@@ -2,7 +2,6 @@ module DatastaxRails #:nodoc:
   module Cql #:nodoc:
     class Select < Base #:nodoc:
       def initialize(klass, select)
-        @klass = klass
         @select = select.join(',')
         @limit = nil
         @conditions = {}
@@ -52,10 +51,11 @@ module DatastaxRails #:nodoc:
         end
 
         @conditions.each do |k, v|
-          if v.is_a?(Array)
+          if k.to_s == @klass.primary_key && v.is_a?(Array)
             conditions << "\"#{k}\" IN (#{('?' * v.size).split(//).join(',')})"
             @values += v
           else
+            v = v.first if v.is_a?(Array)
             conditions << "\"#{k}\" = ?"
             @values << v
           end

data/lib/datastax_rails/dynamic_model.rb

@@ -78,7 +78,7 @@ module DatastaxRails
   class DynamicModel < WideStorageModel
     self.abstract_class = true
 
-    PREFIXES = { string: :s_, text: :t_, boolean: :b_, date: :d_,
+    PREFIXES = { string: :s_, text: :t_, boolean: :b_, date: :d_, long: :l_, double: :db_,
                  timestamp: :ts_, integer: :i_, float: :f_, uuid: :u_ }.with_indifferent_access
 
     class_attribute :group_by_attribute

data/lib/datastax_rails/errors.rb

@@ -16,4 +16,7 @@ module DatastaxRails
 
   class UnknownAttributeError < DatastaxRailsError
   end
+
+  class NotPersistedError < DatastaxRailsError
+  end
 end