avromatic 2.2.5 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdd13d41971f1b38c3b1a9496ec698a14122b69ed5442b4cca7ac7e7d099c6b2
-  data.tar.gz: af4fbf880781abeffc7e0807491ca43a0fdabdff5714c60bfe46b365caa355a5
+  metadata.gz: 5038f6f83ba2ca87bc8cd16a96aae5528397ca5cf9ef01d955861459ae68391a
+  data.tar.gz: 83f5e8bb53086297882f77108480976292a2ca97b40dcb3da5a23c579a7c1edd
 SHA512:
-  metadata.gz: 856111e8a1f7e5ec99cbbe20877095ff630182f27265617e7746437402e4146628c5ae2812f85a9f0cd5c234b748bd1b1c8abee8fddb92e21bc137537074a0d4
-  data.tar.gz: 275aa990b3a84aaa679141955a93800cb4764fc0bbf44a290cbaebd4d54e1cd443f2a3943431b2781bcc6165df06861c7a0d6f9c6bf4c754732737518935d896
+  metadata.gz: 5d5f8501fc5e050db26475ea1205a1c08f864d6fae8272e54c4a04df4fb22bf634868dadde7eade371a6b22f5438423f84a6405808286b1c687fb7acb26859c3
+  data.tar.gz: 7025885a25ab59923d8efc08e494a51f3c6bc57f0e72eedc84c00b9b46c1ef1df085d99ba9135d6997a8370f3fb1497690a714ca067896faad1a2e9a25f0e970

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # avromatic changelog
 
+## v2.2.6
+- Optimize memory usage when serializing models.
+
 ## v2.2.5
 - Optimize memory usage when serializing, deserializing and instantiating models.
 

data/lib/avromatic/io/datum_writer.rb

@@ -5,10 +5,6 @@ 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)
@@ -18,8 +14,6 @@ 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/configurable.rb

@@ -8,6 +8,17 @@ module Avromatic
     module Configurable
       extend ActiveSupport::Concern
 
+      # Wraps a reference to a field so we can access both the string and symbolized versions of the name
+      # without repeated memory allocations.
+      class FieldReference
+        attr_reader :name, :name_sym
+
+        def initialize(name)
+          @name = -name
+          @name_sym = name.to_sym
+        end
+      end
+
       module ClassMethods
         attr_accessor :config
         delegate :avro_schema, :value_avro_schema, :key_avro_schema, to: :config
@@ -20,6 +31,18 @@ module Avromatic
           @key_avro_field_names ||= key_avro_schema.fields.map(&:name).map(&:to_sym).freeze
         end
 
+        def value_avro_field_references
+          @value_avro_field_references ||= value_avro_schema.fields.map do |field|
+            Avromatic::Model::Configurable::FieldReference.new(field.name)
+          end.freeze
+        end
+
+        def key_avro_field_references
+          @key_avro_field_references ||= key_avro_schema.fields.map do |field|
+            Avromatic::Model::Configurable::FieldReference.new(field.name)
+          end.freeze
+        end
+
         def value_avro_fields_by_name
           @value_avro_fields_by_name ||= mapped_by_name(value_avro_schema)
         end
@@ -43,6 +66,7 @@ module Avromatic
 
       delegate :avro_schema, :value_avro_schema, :key_avro_schema,
                :value_avro_field_names, :key_avro_field_names,
+               :value_avro_field_references, :key_avro_field_references,
                to: :class
     end
   end

data/lib/avromatic/model/raw_serialization.rb

@@ -29,37 +29,37 @@ module Avromatic
 
         def value_attributes_for_avro(validate: true)
           if self.class.config.mutable
-            avro_hash(value_avro_field_names, validate: validate)
+            avro_hash(value_avro_field_references, validate: validate)
           else
-            @value_attributes_for_avro ||= avro_hash(value_avro_field_names, validate: validate)
+            @value_attributes_for_avro ||= avro_hash(value_avro_field_references, validate: validate)
           end
         end
 
         def key_attributes_for_avro(validate: true)
-          avro_hash(key_avro_field_names, validate: validate)
+          avro_hash(key_avro_field_references, validate: validate)
         end
 
         def avro_value_datum(validate: true)
           if self.class.config.mutable
-            avro_hash(value_avro_field_names, strict: true, validate: validate)
+            avro_hash(value_avro_field_references, strict: true, validate: validate)
           else
-            @avro_datum ||= avro_hash(value_avro_field_names, strict: true, validate: validate)
+            @avro_datum ||= avro_hash(value_avro_field_references, strict: true, validate: validate)
           end
         end
 
         def avro_key_datum(validate: true)
-          avro_hash(key_avro_field_names, strict: true, validate: validate)
+          avro_hash(key_avro_field_references, strict: true, validate: validate)
         end
 
         private
 
-        def avro_hash(fields, strict: false, validate:)
+        def avro_hash(field_references, strict: false, validate:)
           avro_validate! if validate
-          fields.each_with_object(Hash.new) do |field, result|
-            next unless _attributes.include?(field)
+          field_references.each_with_object(Hash.new) do |field_reference, result|
+            next unless _attributes.include?(field_reference.name_sym)
 
-            value = _attributes[field]
-            result[field.to_s] = attribute_definitions[field].serialize(value, strict)
+            value = _attributes[field_reference.name_sym]
+            result[field_reference.name] = attribute_definitions[field_reference.name_sym].serialize(value, strict)
           end
         end
 

data/lib/avromatic/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avromatic
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - Salsify Engineering
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-23 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel