avromatic 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cc3e17c99ffc3587dc747dbc97da2b63304e20e2bbc7f335a00878ae87bbcf2
-  data.tar.gz: 47e581e34bf75f8ea6fd6775ab91c67c51566475e0d831452bd6ef922f185151
+  metadata.gz: bdd13d41971f1b38c3b1a9496ec698a14122b69ed5442b4cca7ac7e7d099c6b2
+  data.tar.gz: af4fbf880781abeffc7e0807491ca43a0fdabdff5714c60bfe46b365caa355a5
 SHA512:
-  metadata.gz: 29d285151df19f4a3611889c2b805a3de2018c08120a6fca53a88234ab5028b63f83c0f499118a56ca23709071a8ef811713575e6d621c74c42ff6936cd038af
-  data.tar.gz: 97bb648dd3e554219b5ecf81611c1dbc482467fabc50c1f219c0d2b52e31eb891903be92cb20b472f3c9e4ac07d2507d59a2b16dacbec374d22a712b19c4c50c
+  metadata.gz: 856111e8a1f7e5ec99cbbe20877095ff630182f27265617e7746437402e4146628c5ae2812f85a9f0cd5c234b748bd1b1c8abee8fddb92e21bc137537074a0d4
+  data.tar.gz: 275aa990b3a84aaa679141955a93800cb4764fc0bbf44a290cbaebd4d54e1cd443f2a3943431b2781bcc6165df06861c7a0d6f9c6bf4c754732737518935d896

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # avromatic changelog
 
+## v2.2.5
+- Optimize memory usage when serializing, deserializing and instantiating models.
+
 ## v2.2.4
 - Compatibility with Avro v1.10.x.
 

data/README.md

@@ -142,7 +142,7 @@ instance.eql?(MyModel.new(id: 123, name: 'Tesla Model 3', enabled: true)) # => t
 instance.hash # => -1279155042741869898
 
 # Retrieve a hash of the model's attributes via to_h, to_hash or attributes
-instance .to_h # => {:id=>123, :name=>"Tesla Model 3", :enabled=>true}
+instance.to_h # => {:id=>123, :name=>"Tesla Model 3", :enabled=>true}
 ```
 
 Or an `Avro::Schema` object can be specified directly:

data/lib/avromatic/io/datum_reader.rb

@@ -25,7 +25,7 @@ module Avromatic
           optional = readers_schema.schemas.first.type_sym == :null
           union_info = if readers_schema.schemas.size == 2 && optional
                          # Avromatic does not treat the union of null and 1 other type as a union
-                         {}
+                         nil
                        elsif optional
                          # Avromatic does not treat the null of an optional field as part of the union
                          { UNION_MEMBER_INDEX => rs_index - 1 }

data/lib/avromatic/io/datum_writer.rb

@@ -5,6 +5,10 @@ module Avromatic
     # Subclass DatumWriter to use additional information about union member
     # index.
     class DatumWriter < Avro::IO::DatumWriter
+      class << self
+        attr_accessor :optimize
+      end
+
       def write_union(writers_schema, datum, encoder)
         optional = writers_schema.schemas.first.type_sym == :null
         if datum.is_a?(Hash) && datum.key?(Avromatic::IO::UNION_MEMBER_INDEX)
@@ -14,6 +18,8 @@ module Avromatic
         elsif optional && writers_schema.schemas.size == 2
           # Optimize for the common case of a union that's just an optional field
           index_of_schema = datum.nil? ? 0 : 1
+        elsif self.class.optimize && optional && datum.nil?
+          index_of_schema = 0
         else
           index_of_schema = writers_schema.schemas.find_index do |schema|
             Avro::Schema.validate(schema, datum)

data/lib/avromatic/model/attributes.rb

@@ -74,23 +74,23 @@ module Avromatic
       def initialize(data = {})
         super()
 
-        valid_keys = []
+        num_valid_keys = 0
         attribute_definitions.each do |attribute_name, attribute_definition|
           if data.include?(attribute_name)
-            valid_keys << attribute_name
+            num_valid_keys += 1
             value = data.fetch(attribute_name)
             send(attribute_definition.setter_name, value)
           elsif data.include?(attribute_definition.name_string)
-            valid_keys << attribute_name
+            num_valid_keys += 1
             value = data[attribute_definition.name_string]
             send(attribute_definition.setter_name, value)
-          elsif !attributes.include?(attribute_name)
+          elsif !_attributes.include?(attribute_name)
             send(attribute_definition.setter_name, attribute_definition.default)
           end
         end
 
-        unless Avromatic.allow_unknown_attributes || valid_keys.size == data.size
-          unknown_attributes = (data.keys.map(&:to_s) - valid_keys.map(&:to_s)).sort
+        unless Avromatic.allow_unknown_attributes || num_valid_keys == data.size
+          unknown_attributes = (data.keys.map(&:to_s) - _attributes.keys.map(&:to_s)).sort
           allowed_attributes = attribute_definitions.keys.map(&:to_s).sort
           message = "Unexpected arguments for #{self.class.name}#initialize: #{unknown_attributes.join(', ')}. " \
             "Only the following arguments are allowed: #{allowed_attributes.join(', ')}. Provided arguments: #{data.inspect}"

data/lib/avromatic/model/raw_serialization.rb

@@ -55,8 +55,11 @@ module Avromatic
 
         def avro_hash(fields, strict: false, validate:)
           avro_validate! if validate
-          attributes.slice(*fields).each_with_object(Hash.new) do |(key, value), result|
-            result[key.to_s] = attribute_definitions[key].serialize(value, strict: strict)
+          fields.each_with_object(Hash.new) do |field, result|
+            next unless _attributes.include?(field)
+
+            value = _attributes[field]
+            result[field.to_s] = attribute_definitions[field].serialize(value, strict)
           end
         end
 

data/lib/avromatic/model/types/abstract_timestamp_type.rb

@@ -38,7 +38,7 @@ module Avromatic
           value.is_a?(::Time) && value.class != ActiveSupport::TimeWithZone && truncated?(value)
         end
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
 

data/lib/avromatic/model/types/abstract_type.rb

@@ -31,7 +31,9 @@ module Avromatic
           raise "#{__method__} must be overridden by #{self.class.name}"
         end
 
-        def serialize(_value, **)
+        # Note we use positional args rather than keyword args to reduce
+        # memory allocations
+        def serialize(_value, _strict)
           raise "#{__method__} must be overridden by #{self.class.name}"
         end
 

data/lib/avromatic/model/types/array_type.rb

@@ -40,11 +40,11 @@ module Avromatic
           value.nil? || (value.is_a?(::Array) && value.all? { |element| value_type.coerced?(element) })
         end
 
-        def serialize(value, strict:)
+        def serialize(value, strict)
           if value.nil?
             value
           else
-            value.map { |element| value_type.serialize(element, strict: strict) }
+            value.map { |element| value_type.serialize(element, strict) }
           end
         end
 

data/lib/avromatic/model/types/boolean_type.rb

@@ -30,7 +30,7 @@ module Avromatic
 
         alias_method :coerced?, :coercible?
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
 

data/lib/avromatic/model/types/custom_type.rb

@@ -55,7 +55,7 @@ module Avromatic
           false
         end
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           @serializer.call(value)
         end
 

data/lib/avromatic/model/types/date_type.rb

@@ -32,7 +32,7 @@ module Avromatic
 
         alias_method :coerced?, :coercible?
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
 

data/lib/avromatic/model/types/enum_type.rb

@@ -47,7 +47,7 @@ module Avromatic
             (input.is_a?(::Symbol) && allowed_values.include?(input.to_s))
         end
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
 

data/lib/avromatic/model/types/fixed_type.rb

@@ -36,7 +36,7 @@ module Avromatic
 
         alias_method :coerced?, :coercible?
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
 

data/lib/avromatic/model/types/float_type.rb

@@ -39,7 +39,7 @@ module Avromatic
           input.nil? || input.is_a?(::Float)
         end
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
 

data/lib/avromatic/model/types/integer_type.rb

@@ -30,7 +30,7 @@ module Avromatic
 
         alias_method :coerced?, :coercible?
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
 

data/lib/avromatic/model/types/map_type.rb

@@ -59,12 +59,12 @@ module Avromatic
           end
         end
 
-        def serialize(value, strict:)
+        def serialize(value, strict)
           if value.nil?
             value
           else
             value.each_with_object({}) do |(element_key, element_value), result|
-              result[key_type.serialize(element_key, strict: strict)] = value_type.serialize(element_value, strict: strict)
+              result[key_type.serialize(element_key, strict)] = value_type.serialize(element_value, strict)
             end
           end
         end

data/lib/avromatic/model/types/null_type.rb

@@ -30,7 +30,7 @@ module Avromatic
 
         alias_method :coerced?, :coercible?
 
-        def serialize(_value, **)
+        def serialize(_value, _strict)
           nil
         end
 

data/lib/avromatic/model/types/record_type.rb

@@ -39,7 +39,7 @@ module Avromatic
           value.nil? || value.is_a?(record_class)
         end
 
-        def serialize(value, strict:)
+        def serialize(value, strict)
           if value.nil?
             value
           elsif !strict && Avromatic.use_custom_datum_writer && Avromatic.use_encoding_providers? && !record_class.config.mutable

data/lib/avromatic/model/types/string_type.rb

@@ -39,7 +39,7 @@ module Avromatic
           value.nil? || value.is_a?(::String)
         end
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
 

data/lib/avromatic/model/types/union_type.rb

@@ -51,7 +51,7 @@ module Avromatic
           end
         end
 
-        def serialize(value, strict:)
+        def serialize(value, strict)
           # Avromatic does not treat the null of an optional field as part of the union
           return nil if value.nil?
 
@@ -60,7 +60,7 @@ module Avromatic
             raise ArgumentError.new("Expected #{value.inspect} to be one of #{value_classes.map(&:name)}")
           end
 
-          hash = member_types[member_index].serialize(value, strict: strict)
+          hash = member_types[member_index].serialize(value, strict)
           if !strict && Avromatic.use_custom_datum_writer && value.is_a?(Avromatic::Model::Attributes)
             hash[Avromatic::IO::UNION_MEMBER_INDEX] = member_index
           end

data/lib/avromatic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avromatic
-  VERSION = '2.2.4'
+  VERSION = '2.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avromatic
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Salsify Engineering
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-30 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -349,8 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: Generate Ruby models from Avro schemas