Optimize RoutePattern allocations (#706)
This commit is contained in:
parent
4a064b2267
commit
967afc3b0f
|
|
@ -21,10 +21,10 @@ namespace Microsoft.AspNetCore.Routing.Patterns
|
||||||
|
|
||||||
internal RoutePattern(
|
internal RoutePattern(
|
||||||
string rawText,
|
string rawText,
|
||||||
Dictionary<string, object> defaults,
|
IReadOnlyDictionary<string, object> defaults,
|
||||||
Dictionary<string, IReadOnlyList<RoutePatternConstraintReference>> constraints,
|
IReadOnlyDictionary<string, IReadOnlyList<RoutePatternConstraintReference>> constraints,
|
||||||
RoutePatternParameterPart[] parameters,
|
IReadOnlyList<RoutePatternParameterPart> parameters,
|
||||||
RoutePatternPathSegment[] pathSegments)
|
IReadOnlyList<RoutePatternPathSegment> pathSegments)
|
||||||
{
|
{
|
||||||
Debug.Assert(defaults != null);
|
Debug.Assert(defaults != null);
|
||||||
Debug.Assert(constraints != null);
|
Debug.Assert(constraints != null);
|
||||||
|
|
|
||||||
|
|
@ -298,19 +298,35 @@ namespace Microsoft.AspNetCore.Routing.Patterns
|
||||||
rawText,
|
rawText,
|
||||||
updatedDefaults,
|
updatedDefaults,
|
||||||
updatedConstraints.ToDictionary(kvp => kvp.Key, kvp => (IReadOnlyList<RoutePatternConstraintReference>)kvp.Value.ToArray()),
|
updatedConstraints.ToDictionary(kvp => kvp.Key, kvp => (IReadOnlyList<RoutePatternConstraintReference>)kvp.Value.ToArray()),
|
||||||
parameters.ToArray(),
|
parameters,
|
||||||
updatedSegments.ToArray());
|
updatedSegments);
|
||||||
|
|
||||||
RoutePatternPathSegment VisitSegment(RoutePatternPathSegment segment)
|
RoutePatternPathSegment VisitSegment(RoutePatternPathSegment segment)
|
||||||
{
|
{
|
||||||
var updatedParts = new RoutePatternPart[segment.Parts.Count];
|
RoutePatternPart[] updatedParts = null;
|
||||||
for (var i = 0; i < segment.Parts.Count; i++)
|
for (var i = 0; i < segment.Parts.Count; i++)
|
||||||
{
|
{
|
||||||
var part = segment.Parts[i];
|
var part = segment.Parts[i];
|
||||||
updatedParts[i] = VisitPart(part);
|
var updatedPart = VisitPart(part);
|
||||||
|
|
||||||
|
if (part != updatedPart)
|
||||||
|
{
|
||||||
|
if (updatedParts == null)
|
||||||
|
{
|
||||||
|
updatedParts = segment.Parts.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
updatedParts[i] = updatedPart;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return SegmentCore(updatedParts);
|
if (updatedParts == null)
|
||||||
|
{
|
||||||
|
// Segment has not changed
|
||||||
|
return segment;
|
||||||
|
}
|
||||||
|
|
||||||
|
return new RoutePatternPathSegment(updatedParts);
|
||||||
}
|
}
|
||||||
|
|
||||||
RoutePatternPart VisitPart(RoutePatternPart part)
|
RoutePatternPart VisitPart(RoutePatternPart part)
|
||||||
|
|
@ -357,6 +373,14 @@ namespace Microsoft.AspNetCore.Routing.Patterns
|
||||||
parameterConstraints.AddRange(parameter.Constraints);
|
parameterConstraints.AddRange(parameter.Constraints);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (Equals(parameter.Default, @default)
|
||||||
|
&& parameter.Constraints.Count == 0
|
||||||
|
&& (parameterConstraints?.Count ?? 0) == 0)
|
||||||
|
{
|
||||||
|
// Part has not changed
|
||||||
|
return part;
|
||||||
|
}
|
||||||
|
|
||||||
return ParameterPartCore(
|
return ParameterPartCore(
|
||||||
parameter.Name,
|
parameter.Name,
|
||||||
@default,
|
@default,
|
||||||
|
|
|
||||||
|
|
@ -138,7 +138,7 @@ namespace Microsoft.AspNetCore.Routing.Patterns
|
||||||
|
|
||||||
if (IsSegmentValid(context, parts))
|
if (IsSegmentValid(context, parts))
|
||||||
{
|
{
|
||||||
segments.Add(new RoutePatternPathSegment(parts.ToArray()));
|
segments.Add(new RoutePatternPathSegment(parts));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Routing.Patterns
|
||||||
[DebuggerDisplay("{DebuggerToString()}")]
|
[DebuggerDisplay("{DebuggerToString()}")]
|
||||||
public sealed class RoutePatternPathSegment
|
public sealed class RoutePatternPathSegment
|
||||||
{
|
{
|
||||||
internal RoutePatternPathSegment(RoutePatternPart[] parts)
|
internal RoutePatternPathSegment(IReadOnlyList<RoutePatternPart> parts)
|
||||||
{
|
{
|
||||||
Parts = parts;
|
Parts = parts;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue