Skip to content

perf(strawberry-shake): index type descriptor lookups to remove O(N²) mapping #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cliedeman wants to merge 1 commit into
base: fork-ci-base
Choose a base branch
from
Open

perf(strawberry-shake): index type descriptor lookups to remove O(N²) mapping #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions ...awberryShake/CodeGeneration/src/CodeGeneration/Mappers/TypeDescriptorMapper.InputTypes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using HotChocolate.Utilities;
using StrawberryShake.CodeGeneration.Analyzers.Models;
using StrawberryShake.CodeGeneration.Descriptors.TypeDescriptors;
using static System.StringComparer;

namespace StrawberryShake.CodeGeneration.Mappers;

Expand Down Expand Up @@ -33,6 +34,21 @@ private static void AddInputTypeProperties(
Dictionary<string, InputTypeDescriptorModel> typeDescriptors,
Dictionary<string, INamedTypeDescriptor> leafTypeDescriptors)
{
// Index the descriptors by their GraphQL type name so that resolving a
// field's input type is a constant-time lookup instead of a linear scan
// per field. The descriptors are keyed by class name (Model.Name) which
// can differ from the GraphQL type name (Model.Type.Name) used here, so a
// dedicated index is required. First insertion wins, mirroring the prior
// First() enumeration order.
var descriptorsByTypeName =
new Dictionary<string, INamedTypeDescriptor>(typeDescriptors.Count, Ordinal);
foreach (var typeDescriptorModel in typeDescriptors.Values)
{
descriptorsByTypeName.TryAdd(
typeDescriptorModel.Model.Type.Name,
typeDescriptorModel.Descriptor);
}

foreach (var typeDescriptorModel in typeDescriptors.Values)
{
var properties = new List<PropertyDescriptor>();
Expand All @@ -50,7 +66,7 @@ private static void AddInputTypeProperties(
{
fieldType = GetInputTypeDescriptor(
field.Type.NamedType(),
typeDescriptors);
descriptorsByTypeName);
}

properties.Add(
Expand All @@ -69,10 +85,8 @@ private static void AddInputTypeProperties(

private static INamedTypeDescriptor GetInputTypeDescriptor(
ITypeDefinition fieldNamedType,
Dictionary<string, InputTypeDescriptorModel> typeDescriptors)
Dictionary<string, INamedTypeDescriptor> descriptorsByTypeName)
{
return typeDescriptors.Values
.First(t => t.Model.Type.Name.EqualsOrdinal(fieldNamedType.Name))
.Descriptor;
return descriptorsByTypeName[fieldNamedType.Name];
}
}
46 changes: 41 additions & 5 deletions src/StrawberryShake/CodeGeneration/src/CodeGeneration/Mappers/TypeDescriptorMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,37 @@ private static void AddProperties(
Dictionary<string, TypeDescriptorModel> typeDescriptors,
Dictionary<string, INamedTypeDescriptor> leafTypeDescriptors)
{
// Index the descriptors so that resolving a field's output type is a
// constant-time lookup instead of a linear scan over every operation.
//
// descriptorsByModel maps each output type model to its descriptor and is
// used by the operation-scanning fallback in GetFieldTypeDescriptor.
//
// interfaceDescriptorsBySelectionSet maps an interface output type's
// selection set to its descriptor. A field whose result is an interface is
// resolved by the selection set its syntax node points at, which uniquely
// identifies the registered interface descriptor. Selection set nodes are
// compared by reference (the analyzer interns them), and the first
// registered descriptor for a given node wins, mirroring the descriptor
// registration order in CollectTypes.
var descriptorsByModel =
new Dictionary<OutputTypeModel, ComplexTypeDescriptor>(
typeDescriptors.Count);
var interfaceDescriptorsBySelectionSet =
new Dictionary<SelectionSetNode, ComplexTypeDescriptor>();

foreach (var typeDescriptorModel in typeDescriptors.Values)
{
descriptorsByModel[typeDescriptorModel.Model] = typeDescriptorModel.Descriptor;

if (typeDescriptorModel.Model.IsInterface)
{
interfaceDescriptorsBySelectionSet.TryAdd(
typeDescriptorModel.Model.SelectionSet,
typeDescriptorModel.Descriptor);
}
}

foreach (var typeDescriptorModel in typeDescriptors.Values.ToList())
{
var properties = new List<PropertyDescriptor>();
Expand All @@ -399,13 +430,20 @@ private static void AddProperties(
{
fieldType = leafTypeDescriptors[namedType.Name];
}
else if (field.SyntaxNode.SelectionSet is { } selectionSet
&& interfaceDescriptorsBySelectionSet.TryGetValue(
selectionSet,
out var interfaceDescriptor))
{
fieldType = interfaceDescriptor;
}
else
{
fieldType = GetFieldTypeDescriptor(
model,
field.SyntaxNode,
field.Type.NamedType(),
typeDescriptors);
descriptorsByModel);
}

var propertyKind = includeOrSkipDirective
Expand Down Expand Up @@ -468,7 +506,7 @@ private static INamedTypeDescriptor GetFieldTypeDescriptor(
ClientModel model,
FieldNode fieldSyntax,
ITypeDefinition fieldNamedType,
Dictionary<string, TypeDescriptorModel> typeDescriptors)
Dictionary<OutputTypeModel, ComplexTypeDescriptor> descriptorsByModel)
{
foreach (var operation in model.Operations)
{
Expand All @@ -477,9 +515,7 @@ private static INamedTypeDescriptor GetFieldTypeDescriptor(
fieldNamedType,
out var fieldType))
{
return typeDescriptors.Values
.First(t => t.Model == fieldType)
.Descriptor;
return descriptorsByModel[fieldType];
}
}

Expand Down
Loading