[Validation] Performance improvements

Related GraphQL-js commit graphql/graphql-js@0bc9088

Author: syrusakbary

graphql/core/validation/context.py

@@ -1,18 +1,27 @@
-from ..language.ast import FragmentDefinition
+from ..language.ast import FragmentDefinition, FragmentSpread
 
 
 class ValidationContext(object):
-    __slots__ = '_schema', '_ast', '_type_info', '_fragments'
+    __slots__ = '_schema', '_ast', '_type_info', '_fragments', '_fragment_spreads'
 
     def __init__(self, schema, ast, type_info):
         self._schema = schema
         self._ast = ast
         self._type_info = type_info
         self._fragments = None
+        self._fragment_spreads = {}
 
     def get_schema(self):
         return self._schema
 
+    def get_fragment_spreads(self, node):
+        spreads = self._fragment_spreads.get(node)
+        if not spreads:
+            spreads = []
+            self.gather_spreads(spreads, node.selection_set)
+            self._fragment_spreads[node] = spreads
+        return spreads
+
     def get_ast(self):
         return self._ast
 
@@ -42,3 +51,11 @@ def get_directive(self):
 
     def get_argument(self):
         return self._type_info.get_argument()
+
+    @classmethod
+    def gather_spreads(cls, spreads, node):
+        for selection in node.selections:
+            if isinstance(selection, FragmentSpread):
+                spreads.append(selection)
+            elif selection.selection_set:
+                cls.gather_spreads(spreads, selection.selection_set)

graphql/core/validation/rules/arguments_of_correct_type.py

@@ -15,6 +15,7 @@ def enter_Argument(self, node, key, parent, path, ancestors):
                                            print_ast(node.value), errors),
                     [node.value]
                 )
+        return False
 
     @staticmethod
     def bad_value_message(arg_name, type, value, verbose_errors):

graphql/core/validation/rules/default_values_of_correct_type.py

@@ -24,6 +24,13 @@ def enter_VariableDefinition(self, node, key, parent, path, ancestors):
                     self.bad_value_for_default_arg_message(name, type, print_ast(default_value), errors),
                     [default_value]
                 )
+        return False
+
+    def enter_SelectionSet(self, node, key, parent, path, ancestors):
+        return False
+
+    def enter_FragmentDefinition(self, node, key, parent, path, ancestors):
+        return False
 
     @staticmethod
     def default_for_non_null_arg_message(var_name, type, guess_type):

graphql/core/validation/rules/no_fragment_cycles.py

@@ -30,8 +30,7 @@ def detect_cycle_recursive(self, fragment):
         fragment_name = fragment.name.value
         self.visited_frags.add(fragment_name)
 
-        spread_nodes = []
-        self.gather_spreads(spread_nodes, fragment.selection_set)
+        spread_nodes = self.context.get_fragment_spreads(fragment)
         if not spread_nodes:
             return
 
@@ -64,11 +63,3 @@ def detect_cycle_recursive(self, fragment):
     def cycle_error_message(fragment_name, spread_names):
         via = ' via {}'.format(', '.join(spread_names)) if spread_names else ''
         return 'Cannot spread fragment "{}" within itself{}.'.format(fragment_name, via)
-
-    @classmethod
-    def gather_spreads(cls, spreads, node):
-        for selection in node.selections:
-            if isinstance(selection, ast.FragmentSpread):
-                spreads.append(selection)
-            elif selection.selection_set:
-                cls.gather_spreads(spreads, selection.selection_set)

graphql/core/validation/rules/no_unused_fragments.py

@@ -7,34 +7,30 @@ class NoUnusedFragments(ValidationRule):
 
     def __init__(self, context):
         super(NoUnusedFragments, self).__init__(context)
-        self.fragment_definitions = []
         self.spreads_within_operation = []
-        self.fragment_adjacencies = {}
-        self.spread_names = set()
+        self.fragment_definitions = []
 
     def enter_OperationDefinition(self, node, key, parent, path, ancestors):
-        self.spread_names = set()
-        self.spreads_within_operation.append(self.spread_names)
+        self.spreads_within_operation.append(self.context.get_fragment_spreads(node))
+        return False
 
     def enter_FragmentDefinition(self, node, key, parent, path, ancestors):
         self.fragment_definitions.append(node)
-        self.spread_names = set()
-        self.fragment_adjacencies[node.name.value] = self.spread_names
-
-    def enter_FragmentSpread(self, node, key, parent, path, ancestors):
-        self.spread_names.add(node.name.value)
+        return False
 
     def leave_Document(self, node, key, parent, path, ancestors):
         fragment_names_used = set()
 
         def reduce_spread_fragments(spreads):
-            for fragment_name in spreads:
-                if fragment_name in fragment_names_used:
+            for spread in spreads:
+                frag_name = spread.name.value
+                if frag_name in fragment_names_used:
                     continue
 
-                fragment_names_used.add(fragment_name)
-                if fragment_name in self.fragment_adjacencies:
-                    reduce_spread_fragments(self.fragment_adjacencies[fragment_name])
+                fragment_names_used.add(frag_name)
+                fragment = self.context.get_fragment(frag_name)
+                if fragment:
+                    reduce_spread_fragments(self.context.get_fragment_spreads(fragment))
 
         for spreads in self.spreads_within_operation:
             reduce_spread_fragments(spreads)

graphql/core/validation/rules/unique_argument_names.py

@@ -25,6 +25,7 @@ def enter_Argument(self, node, key, parent, path, ancestors):
             )
 
         self.known_arg_names[arg_name] = node.name
+        return False
 
     @staticmethod
     def duplicate_arg_message(field):

graphql/core/validation/rules/unique_fragment_names.py

@@ -9,6 +9,9 @@ def __init__(self, context):
         super(UniqueFragmentNames, self).__init__(context)
         self.known_fragment_names = {}
 
+    def enter_OperationDefinition(self, node, key, parent, path, ancestors):
+        return False
+
     def enter_FragmentDefinition(self, node, key, parent, path, ancestors):
         fragment_name = node.name.value
         if fragment_name in self.known_fragment_names:
@@ -18,6 +21,7 @@ def enter_FragmentDefinition(self, node, key, parent, path, ancestors):
             )
 
         self.known_fragment_names[fragment_name] = node.name
+        return False
 
     @staticmethod
     def duplicate_fragment_name_message(field):

graphql/core/validation/rules/unique_input_field_names.py

@@ -26,6 +26,7 @@ def enter_ObjectField(self, node, key, parent, path, ancestors):
             )
 
         self.known_names[field_name] = node.name
+        return False
 
     @staticmethod
     def duplicate_input_field_message(field_name):

graphql/core/validation/rules/unique_operation_names.py

@@ -21,6 +21,10 @@ def enter_OperationDefinition(self, node, key, parent, path, ancestors):
             )
 
         self.known_operation_names[operation_name.value] = operation_name
+        return False
+
+    def enter_FragmentDefinition(self, node, key, parent, path, ancestors):
+        return False
 
     @staticmethod
     def duplicate_operation_name_message(operation_name):