Merge pull request #5037 from rmosolgo/compare-by-identity-cleanup

Clean up compare-by-identity usage

lib/graphql/execution/interpreter/arguments_cache.rb

@@ -8,22 +8,17 @@ def initialize(query)
           @query = query
           @dataloader = query.context.dataloader
           @storage = Hash.new do |h, argument_owner|
-            args_by_parent = if argument_owner.arguments_statically_coercible?
+            h[argument_owner] = if argument_owner.arguments_statically_coercible?
               shared_values_cache = {}
               Hash.new do |h2, ignored_parent_object|
                 h2[ignored_parent_object] = shared_values_cache
-              end
+              end.compare_by_identity
             else
               Hash.new do |h2, parent_object|
-                args_by_node = {}
-                args_by_node.compare_by_identity
-                h2[parent_object] = args_by_node
-              end
+                h2[parent_object] = {}.compare_by_identity
+              end.compare_by_identity
             end
-            args_by_parent.compare_by_identity
-            h[argument_owner] = args_by_parent
-          end
-          @storage.compare_by_identity
+          end.compare_by_identity
         end
 
         def fetch(ast_node, argument_owner, parent_object)

lib/graphql/execution/interpreter/runtime.rb

@@ -53,8 +53,7 @@ def initialize(query:, lazies_at_depth:)
             end
           end
           # { Class => Boolean }
-          @lazy_cache = {}
-          @lazy_cache.compare_by_identity
+          @lazy_cache = {}.compare_by_identity
         end
 
         def final_result
@@ -727,12 +726,7 @@ def directives_include?(node, graphql_object, parent_type)
         end
 
         def get_current_runtime_state
-          current_state = Thread.current[:__graphql_runtime_info] ||= begin
-            per_query_state = {}
-            per_query_state.compare_by_identity
-            per_query_state
-          end
-
+          current_state = Thread.current[:__graphql_runtime_info] ||= {}.compare_by_identity
           current_state[@query] ||= CurrentState.new
         end
 

lib/graphql/schema.rb

@@ -1501,7 +1501,7 @@ def own_types
       end
 
       def own_references_to
-        @own_references_to ||= {}.tap(&:compare_by_identity)
+        @own_references_to ||= {}.compare_by_identity
       end
 
       def non_introspection_types
@@ -1517,7 +1517,7 @@ def own_orphan_types
       end
 
       def own_possible_types
-        @own_possible_types ||= {}.tap(&:compare_by_identity)
+        @own_possible_types ||= {}.compare_by_identity
       end
 
       def own_union_memberships

lib/graphql/schema/introspection_system.rb

@@ -25,7 +25,7 @@ def initialize(schema)
           load_constant(:DirectiveLocationEnum)
         ]
         @types = {}
-        @possible_types = {}.tap(&:compare_by_identity)
+        @possible_types = {}.compare_by_identity
         type_defns.each do |t|
           @types[t.graphql_name] = t
           @possible_types[t] = [t]

lib/graphql/schema/warden.rb

@@ -188,7 +188,6 @@ def initialize(context:, schema:)
         @subscription = @schema.subscription
         @context = context
         @visibility_cache = read_through { |m| schema.visible?(m, context) }
-        @visibility_cache.compare_by_identity
         # Initialize all ivars to improve object shape consistency:
         @types = @visible_types = @reachable_types = @visible_parent_fields =
           @visible_possible_types = @visible_fields = @visible_arguments = @visible_enum_arrays =
@@ -463,9 +462,7 @@ def visible?(member)
       end
 
       def read_through
-        h = Hash.new { |h, k| h[k] = yield(k) }
-        h.compare_by_identity
-        h
+        Hash.new { |h, k| h[k] = yield(k) }.compare_by_identity
       end
 
       def reachable_type_set