Merge pull request #1915 from dnesteryuk/chore/micro-optimization-in-hashes-arrays

micro optimizations in allocating hashes and arrays

Author: dblock

CHANGELOG.md

@@ -3,6 +3,7 @@
 #### Features
 
 * Your contribution here.
+* [#1915](https://github.com/ruby-grape/grape/pull/1915): Micro optimizations in allocating hashes and arrays - [@dnesteryuk](https://github.com/dnesteryuk).
 * [#1904](https://github.com/ruby-grape/grape/pull/1904): Allows Grape to load files on startup rather than on the first call - [@myxoh](https://github.com/myxoh).
 * [#1907](https://github.com/ruby-grape/grape/pull/1907): Adds outside configuration to Grape with `configure` - [@unleashy](https://github.com/unleashy).
 * [#1914](https://github.com/ruby-grape/grape/pull/1914): Run specs in random order - [@splattael](https://github.com/splattael).

benchmark/nested_params.rb

@@ -0,0 +1,41 @@
+require 'grape'
+require 'benchmark/ips'
+
+class API < Grape::API
+  prefix :api
+  version 'v1', using: :path
+
+  params do
+    requires :address, type: Hash do
+      requires :street, type: String
+      requires :postal_code, type: Integer
+      optional :city, type: String
+    end
+  end
+  post '/' do
+    'hello'
+  end
+end
+
+options = {
+  method: 'POST',
+  params: {
+    address: {
+      street: 'Alexis Pl.',
+      postal_code: '90210',
+      city: 'Beverly Hills'
+    }
+  }
+}
+
+env = Rack::MockRequest.env_for('/api/v1', options)
+
+10.times do |i|
+  env["HTTP_HEADER#{i}"] = '123'
+end
+
+Benchmark.ips do |ips|
+  ips.report('POST with nested params') do
+    API.call env
+  end
+end

lib/grape/endpoint.rb

@@ -200,7 +200,7 @@ def prepare_version
     end
 
     def merge_route_options(**default)
-      options[:route_options].clone.merge(**default)
+      options[:route_options].clone.merge!(**default)
     end
 
     def map_routes

lib/grape/error_formatter.rb

@@ -14,7 +14,7 @@ def builtin_formatters
       end
 
       def formatters(options)
-        builtin_formatters.merge(default_elements).merge(options[:error_formatters] || {})
+        builtin_formatters.merge(default_elements).merge!(options[:error_formatters] || {})
       end
 
       def formatter_for(api_format, **options)

lib/grape/exceptions/validation_errors.rb

@@ -39,14 +39,16 @@ def to_json(**_opts)
       end
 
       def full_messages
-        map { |attributes, error| full_message(attributes, error) }.uniq
+        messages = map { |attributes, error| full_message(attributes, error) }
+        messages.uniq!
+        messages
       end
 
       private
 
       def full_message(attributes, error)
         I18n.t(
-          'grape.errors.format'.to_sym,
+          'grape.errors.format',
           default: '%{attributes} %{message}',
           attributes: attributes.count == 1 ? translate_attribute(attributes.first) : translate_attributes(attributes),
           message: error.message

lib/grape/formatter.rb

@@ -14,7 +14,7 @@ def builtin_formmaters
       end
 
       def formatters(options)
-        builtin_formmaters.merge(default_elements).merge(options[:formatters] || {})
+        builtin_formmaters.merge(default_elements).merge!(options[:formatters] || {})
       end
 
       def formatter_for(api_format, **options)

lib/grape/parser.rb

@@ -12,7 +12,7 @@ def builtin_parsers
       end
 
       def parsers(options)
-        builtin_parsers.merge(default_elements).merge(options[:parsers] || {})
+        builtin_parsers.merge(default_elements).merge!(options[:parsers] || {})
       end
 
       def parser_for(api_format, **options)

lib/grape/util/base_inheritable.rb

@@ -0,0 +1,34 @@
+module Grape
+  module Util
+    # Base for classes which need to operate with own values kept
+    # in the hash and inherited values kept in a Hash-like object.
+    class BaseInheritable
+      attr_accessor :inherited_values
+      attr_accessor :new_values
+
+      # @param inherited_values [Object] An object implementing an interface
+      #   of the Hash class.
+      def initialize(inherited_values = {})
+        @inherited_values = inherited_values
+        @new_values = {}
+      end
+
+      def delete(key)
+        new_values.delete key
+      end
+
+      def initialize_copy(other)
+        super
+        self.inherited_values = other.inherited_values
+        self.new_values = other.new_values.dup
+      end
+
+      def keys
+        combined = inherited_values.keys
+        combined.concat(new_values.keys)
+        combined.uniq!
+        combined
+      end
+    end
+  end
+end

lib/grape/util/inheritable_values.rb

@@ -1,14 +1,8 @@
+require_relative 'base_inheritable'
+
 module Grape
   module Util
-    class InheritableValues
-      attr_accessor :inherited_values
-      attr_accessor :new_values
-
-      def initialize(inherited_values = {})
-        self.inherited_values = inherited_values
-        self.new_values = {}
-      end
-
+    class InheritableValues < BaseInheritable
       def [](name)
         values[name]
       end
@@ -17,26 +11,12 @@ def []=(name, value)
         new_values[name] = value
       end
 
-      def delete(key)
-        new_values.delete key
-      end
-
       def merge(new_hash)
-        values.merge(new_hash)
-      end
-
-      def keys
-        (new_values.keys + inherited_values.keys).sort.uniq
+        values.merge!(new_hash)
       end
 
       def to_hash
-        values.clone
-      end
-
-      def initialize_copy(other)
-        super
-        self.inherited_values = other.inherited_values
-        self.new_values = other.new_values.dup
+        values
       end
 
       protected

lib/grape/util/reverse_stackable_values.rb

@@ -1,45 +1,16 @@
+require_relative 'stackable_values'
+
 module Grape
   module Util
-    class ReverseStackableValues
-      attr_accessor :inherited_values
-      attr_accessor :new_values
-
-      def initialize(inherited_values = {})
-        @inherited_values = inherited_values
-        @new_values = {}
-      end
+    class ReverseStackableValues < StackableValues
+      protected
 
-      def [](name)
+      def concat_values(inherited_value, new_value)
         [].tap do |value|
-          value.concat(@new_values[name] || [])
-          value.concat(@inherited_values[name] || [])
-        end
-      end
-
-      def []=(name, value)
-        @new_values[name] ||= []
-        @new_values[name].push value
-      end
-
-      def delete(key)
-        new_values.delete key
-      end
-
-      def keys
-        (@new_values.keys + @inherited_values.keys).sort.uniq
-      end
-
-      def to_hash
-        keys.each_with_object({}) do |key, result|
-          result[key] = self[key]
+          value.concat(new_value)
+          value.concat(inherited_value)
         end
       end
-
-      def initialize_copy(other)
-        super
-        self.inherited_values = other.inherited_values
-        self.new_values = other.new_values.dup
-      end
     end
   end
 end

lib/grape/util/stackable_values.rb

@@ -1,23 +1,25 @@
+require_relative 'base_inheritable'
+
 module Grape
   module Util
-    class StackableValues
-      attr_accessor :inherited_values
-      attr_accessor :new_values
+    class StackableValues < BaseInheritable
       attr_reader :frozen_values
 
-      def initialize(inherited_values = {})
-        @inherited_values = inherited_values
-        @new_values = {}
+      def initialize(*_args)
+        super
+
         @frozen_values = {}
       end
 
       def [](name)
         return @frozen_values[name] if @frozen_values.key? name
 
-        value = []
-        value.concat(@inherited_values[name] || [])
-        value.concat(@new_values[name] || [])
-        value
+        inherited_value = @inherited_values[name]
+        new_value = @new_values[name] || []
+
+        return new_value unless inherited_value
+
+        concat_values(inherited_value, new_value)
       end
 
       def []=(name, value)
@@ -26,14 +28,6 @@ def []=(name, value)
         @new_values[name].push value
       end
 
-      def delete(key)
-        new_values.delete key
-      end
-
-      def keys
-        (@new_values.keys + @inherited_values.keys).sort.uniq
-      end
-
       def to_hash
         keys.each_with_object({}) do |key, result|
           result[key] = self[key]
@@ -44,10 +38,13 @@ def freeze_value(key)
         @frozen_values[key] = self[key].freeze
       end
 
-      def initialize_copy(other)
-        super
-        self.inherited_values = other.inherited_values
-        self.new_values = other.new_values.dup
+      protected
+
+      def concat_values(inherited_value, new_value)
+        [].tap do |value|
+          value.concat(inherited_value)
+          value.concat(new_value)
+        end
       end
     end
   end

lib/grape/validations/validators/base.rb

@@ -56,10 +56,10 @@ def validate!(params)
 
       def self.convert_to_short_name(klass)
         ret = klass.name.gsub(/::/, '/')
-                   .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-                   .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-                   .tr('-', '_')
-                   .downcase
+        ret.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+        ret.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+        ret.tr!('-', '_')
+        ret.downcase!
         File.basename(ret, '_validator')
       end