avro-patches 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e27ae4a91d001f377ddce29a8b2b4c6b10fb143c
-  data.tar.gz: f869f474d9baa39737b33d686bd50b6f08f20eae
+  metadata.gz: 4501694b4e822ab5d2f9b08cd4d2406474b7efa6
+  data.tar.gz: 7cb86acf0bb9cb38486d59263904e1eac8eb4be7
 SHA512:
-  metadata.gz: d7a84490ba988ac5a9fb3c6146465f74578b383af85ae91d1d6a3580096216dc0e071c827be1d15e3b7065d2cdb71fffa659765a57c0c37667a6bf4988e3eee6
-  data.tar.gz: 70740d128af9aed6bbab211477b7dd8c4cd359c71e6319249e8f5c3876f91e743986bbd93576e501e1e7f6ceabc0d1a664bc29fa4d9b3712397add89f425d73e
+  metadata.gz: 7d2aa4dc274fef6e4727ac3d3842c984223b0ab8ab2fdaed522490d4a4a28d15ae636fb7844aea8f5ff20f0983e698c9d8aec42c3e7e3ba7b2b08e9e1a692761
+  data.tar.gz: 03b0e275a36bfbf88e18638661bbc59bcad4a423a6767743a5560c9b2092e8a25a829128c941d8bb3b79693926b478361d78b47826e3b37939e0a94a7f2c172c

data/CHANGELOG.md

@@ -1,4 +1,7 @@
 # avro-patches
 
+## v0.2.0
+- Performance improvements for `Avro::SchemaValidator`.
+
 ## v0.1.0
 - Initial version

data/lib/avro-patches/schema_validator/schema_validator.rb

@@ -20,7 +20,8 @@ module Avro
     PATH_SEPARATOR = '.'.freeze
     INT_RANGE = Schema::INT_MIN_VALUE..Schema::INT_MAX_VALUE
     LONG_RANGE = Schema::LONG_MIN_VALUE..Schema::LONG_MAX_VALUE
-    COMPLEX_TYPES = [:array, :error, :map, :record, :request]
+    COMPLEX_TYPES = [:array, :error, :map, :record, :request].freeze
+    BOOLEAN_VALUES = [true, false].freeze
 
     class Result
       attr_reader :errors
@@ -76,7 +77,7 @@ module Avro
         when :null
           fail TypeMismatchError unless datum.nil?
         when :boolean
-          fail TypeMismatchError unless [true, false].include?(datum)
+          fail TypeMismatchError unless BOOLEAN_VALUES.include?(datum)
         when :string, :bytes
           fail TypeMismatchError unless datum.is_a?(String)
         when :int
@@ -86,17 +87,15 @@ module Avro
           fail TypeMismatchError unless datum.is_a?(Integer)
           result.add_error(path, "out of bound value #{datum}") unless LONG_RANGE.cover?(datum)
         when :float, :double
-          fail TypeMismatchError unless [Float, Integer].any?(&datum.method(:is_a?))
+          fail TypeMismatchError unless datum.is_a?(Float) || datum.is_a?(Integer)
         when :fixed
           if datum.is_a? String
-            message = "expected fixed with size #{expected_schema.size}, got \"#{datum}\" with size #{datum.size}"
-            result.add_error(path, message) unless datum.bytesize == expected_schema.size
+            result.add_error(path, fixed_string_message(expected_schema.size, datum)) unless datum.bytesize == expected_schema.size
           else
             result.add_error(path, "expected fixed with size #{expected_schema.size}, got #{actual_value_message(datum)}")
           end
         when :enum
-          message = "expected enum with values #{expected_schema.symbols}, got #{actual_value_message(datum)}"
-          result.add_error(path, message) unless expected_schema.symbols.include?(datum)
+          result.add_error(path, enum_message(expected_schema.symbols, datum)) unless expected_schema.symbols.include?(datum)
         when :array
           validate_array(expected_schema, datum, path, result)
         when :map
@@ -116,6 +115,14 @@ module Avro
         result.add_error(path, "expected type #{expected_schema.type_sym}, got #{actual_value_message(datum)}")
       end
 
+      def fixed_string_message(size, datum)
+        "expected fixed with size #{size}, got \"#{datum}\" with size #{datum.size}"
+      end
+
+      def enum_message(symbols, datum)
+        "expected enum with values #{symbols}, got #{actual_value_message(datum)}"
+      end
+
       def validate_array(expected_schema, datum, path, result)
         fail TypeMismatchError unless datum.is_a?(Array)
         datum.each_with_index do |d, i|
@@ -138,9 +145,10 @@ module Avro
           validate_recursive(expected_schema.schemas.first, datum, path, result)
           return
         end
-        types_and_results = validate_possible_types(datum, expected_schema, path)
-        failures, successes = types_and_results.partition { |r| r[:result].failure? }
-        return if successes.any?
+        failures = []
+        compatible_type = first_compatible_type(datum, expected_schema, path, failures)
+        return unless compatible_type.nil?
+
         complex_type_failed = failures.detect { |r| COMPLEX_TYPES.include?(r[:type]) }
         if complex_type_failed
           complex_type_failed[:result].errors.each { |error| result << error }
@@ -150,11 +158,12 @@ module Avro
         end
       end
 
-      def validate_possible_types(datum, expected_schema, path)
-        expected_schema.schemas.map do |schema|
+      def first_compatible_type(datum, expected_schema, path, failures)
+        expected_schema.schemas.find do |schema|
           result = Result.new
           validate_recursive(schema, datum, path, result)
-          { type: schema.type_sym, result: result }
+          failures << { type: schema.type_sym, result: result } if result.failure?
+          !result.failure?
         end
       end
 
@@ -162,8 +171,6 @@ module Avro
         "#{path}#{PATH_SEPARATOR}#{sub_key}".squeeze(PATH_SEPARATOR)
       end
 
-      private
-
       def actual_value_message(value)
         avro_type = if value.is_a?(Integer)
                       ruby_integer_to_avro_type(value)

data/lib/avro-patches/version.rb

@@ -1,3 +1,3 @@
 module AvroPatches
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avro-patches
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Salsify, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler