Vectorized HttpCharacters (and used IndexOfAnyValues in other places found) (#45300)

gfoidl · web-flow · commit 19e467483221 · 2022-12-07T17:02:07.000-08:00
diff --git a/src/Components/Components/src/Routing/TemplateParser.cs b/src/Components/Components/src/Routing/TemplateParser.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Buffers;
+
 namespace Microsoft.AspNetCore.Components.Routing;
 
 // This implementation is temporary, in the future we'll want to have
@@ -18,8 +20,7 @@ namespace Microsoft.AspNetCore.Components.Routing;
 // * Catch-all parameters (Like /blog/{*slug})
 internal sealed class TemplateParser
 {
-    public static readonly char[] InvalidParameterNameCharacters =
-        new char[] { '{', '}', '=', '.' };
+    private static readonly IndexOfAnyValues<char> _invalidParameterNameCharacters = IndexOfAnyValues.Create("{}=.");
 
     internal static RouteTemplate ParseTemplate(string template)
     {
@@ -70,9 +71,10 @@ internal static RouteTemplate ParseTemplate(string template)
                         $"Invalid template '{template}'. Empty parameter name in segment '{segment}' is not allowed.");
                 }
 
-                var invalidCharacter = segment.IndexOfAny(InvalidParameterNameCharacters, 1, segment.Length - 2);
-                if (invalidCharacter != -1)
+                var invalidCharacter = segment.AsSpan(1, segment.Length - 2).IndexOfAny(_invalidParameterNameCharacters);
+                if (invalidCharacter >= 0)
                 {
+                    invalidCharacter++;     // accommodate the slice above
                     throw new InvalidOperationException(
                         $"Invalid template '{template}'. The character '{segment[invalidCharacter]}' in parameter segment '{segment}' is not allowed.");
                 }
diff --git a/src/Http/Routing/src/Patterns/RoutePatternFactory.cs b/src/Http/Routing/src/Patterns/RoutePatternFactory.cs
@@ -807,7 +807,7 @@ public static RoutePatternParameterPart ParameterPart(string parameterName)
             throw new ArgumentException(Resources.Argument_NullOrEmpty, nameof(parameterName));
         }
 
-        if (parameterName.IndexOfAny(RoutePatternParser.InvalidParameterNameChars) >= 0)
+        if (parameterName.AsSpan().IndexOfAny(RoutePatternParser.InvalidParameterNameChars) >= 0)
         {
             throw new ArgumentException(Resources.FormatTemplateRoute_InvalidParameterName(parameterName));
         }
@@ -833,7 +833,7 @@ public static RoutePatternParameterPart ParameterPart(string parameterName, obje
             throw new ArgumentException(Resources.Argument_NullOrEmpty, nameof(parameterName));
         }
 
-        if (parameterName.IndexOfAny(RoutePatternParser.InvalidParameterNameChars) >= 0)
+        if (parameterName.AsSpan().IndexOfAny(RoutePatternParser.InvalidParameterNameChars) >= 0)
         {
             throw new ArgumentException(Resources.FormatTemplateRoute_InvalidParameterName(parameterName));
         }
@@ -863,7 +863,7 @@ public static RoutePatternParameterPart ParameterPart(
             throw new ArgumentException(Resources.Argument_NullOrEmpty, nameof(parameterName));
         }
 
-        if (parameterName.IndexOfAny(RoutePatternParser.InvalidParameterNameChars) >= 0)
+        if (parameterName.AsSpan().IndexOfAny(RoutePatternParser.InvalidParameterNameChars) >= 0)
         {
             throw new ArgumentException(Resources.FormatTemplateRoute_InvalidParameterName(parameterName));
         }
@@ -900,7 +900,7 @@ public static RoutePatternParameterPart ParameterPart(
             throw new ArgumentException(Resources.Argument_NullOrEmpty, nameof(parameterName));
         }
 
-        if (parameterName.IndexOfAny(RoutePatternParser.InvalidParameterNameChars) >= 0)
+        if (parameterName.AsSpan().IndexOfAny(RoutePatternParser.InvalidParameterNameChars) >= 0)
         {
             throw new ArgumentException(Resources.FormatTemplateRoute_InvalidParameterName(parameterName));
         }
@@ -942,7 +942,7 @@ public static RoutePatternParameterPart ParameterPart(
             throw new ArgumentException(Resources.Argument_NullOrEmpty, nameof(parameterName));
         }
 
-        if (parameterName.IndexOfAny(RoutePatternParser.InvalidParameterNameChars) >= 0)
+        if (parameterName.AsSpan().IndexOfAny(RoutePatternParser.InvalidParameterNameChars) >= 0)
         {
             throw new ArgumentException(Resources.FormatTemplateRoute_InvalidParameterName(parameterName));
         }
diff --git a/src/Http/Routing/src/Patterns/RoutePatternParser.cs b/src/Http/Routing/src/Patterns/RoutePatternParser.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System.Buffers;
 using System.Diagnostics;
 
 namespace Microsoft.AspNetCore.Routing.Patterns;
@@ -13,17 +14,9 @@ internal static class RoutePatternParser
     private const char OpenBrace = '{';
     private const char CloseBrace = '}';
     private const char QuestionMark = '?';
-    private const char Asterisk = '*';
     private const string PeriodString = ".";
 
-    internal static readonly char[] InvalidParameterNameChars = new char[]
-    {
-        Separator,
-        OpenBrace,
-        CloseBrace,
-        QuestionMark,
-        Asterisk
-    };
+    internal static readonly IndexOfAnyValues<char> InvalidParameterNameChars = IndexOfAnyValues.Create("/{}?*");
 
     public static RoutePattern Parse(string pattern)
     {
@@ -431,7 +424,7 @@ private static bool IsSegmentValid(Context context, List<RoutePatternPart> parts
 
     private static bool IsValidParameterName(Context context, string parameterName)
     {
-        if (parameterName.Length == 0 || parameterName.IndexOfAny(InvalidParameterNameChars) >= 0)
+        if (parameterName.Length == 0 || parameterName.AsSpan().IndexOfAny(InvalidParameterNameChars) >= 0)
         {
             context.Error = Resources.FormatTemplateRoute_InvalidParameterName(parameterName);
             return false;
diff --git a/src/Servers/Kestrel/Core/src/Internal/KestrelServerImpl.cs b/src/Servers/Kestrel/Core/src/Internal/KestrelServerImpl.cs
@@ -7,7 +7,6 @@
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Hosting.Server.Features;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http;
@@ -89,8 +88,6 @@ internal KestrelServerImpl(
         Features.Set<IServerAddressesFeature>(_serverAddresses);
 
         _transportManager = new TransportManager(_transportFactories, _multiplexedTransportFactories, ServiceContext);
-
-        HttpCharacters.Initialize();
     }
 
     private static ServiceContext CreateServiceContext(IOptions<KestrelServerOptions> options, ILoggerFactory loggerFactory, DiagnosticSource? diagnosticSource)
diff --git a/src/Shared/HttpSys/RequestProcessing/HeaderCollection.cs b/src/Shared/HttpSys/RequestProcessing/HeaderCollection.cs
@@ -272,10 +272,12 @@ public static void ValidateHeaderCharacters(string headerCharacters)
     {
         if (headerCharacters != null)
         {
-            var invalid = HttpCharacters.IndexOfInvalidFieldValueCharExtended(headerCharacters);
-            if (invalid >= 0)
+            var invalidIndex = HttpCharacters.IndexOfInvalidFieldValueCharExtended(headerCharacters);
+            if (invalidIndex >= 0)
             {
-                throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, "Invalid control character in header: 0x{0:X2}", headerCharacters[invalid]));
+                Throw(headerCharacters, invalidIndex);
+                static void Throw(string headerCharacters, int invalidIndex)
+                    => throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, "Invalid control character in header: 0x{0:X2}", headerCharacters[invalidIndex]));
             }
         }
     }
diff --git a/src/Shared/ServerInfrastructure/HttpCharacters.cs b/src/Shared/ServerInfrastructure/HttpCharacters.cs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`// Licensed to the .NET Foundation under one or more agreements.`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`
	`4`	`+using System.Buffers;`
	`5`	`+`
`4`	`6`	`namespace Microsoft.AspNetCore.Components.Routing;`
`5`	`7`
`6`	`8`	`// This implementation is temporary, in the future we'll want to have`
`@@ -18,8 +20,7 @@ namespace Microsoft.AspNetCore.Components.Routing;`
`18`	`20`	`// * Catch-all parameters (Like /blog/{*slug})`
`19`	`21`	`internal sealed class TemplateParser`
`20`	`22`	`{`
`21`		`- public static readonly char[] InvalidParameterNameCharacters =`
`22`		`- new char[] { '{', '}', '=', '.' };`
	`23`	`+ private static readonly IndexOfAnyValues<char> _invalidParameterNameCharacters = IndexOfAnyValues.Create("{}=.");`
`23`	`24`
`24`	`25`	`internal static RouteTemplate ParseTemplate(string template)`
`25`	`26`	`{`
`@@ -70,9 +71,10 @@ internal static RouteTemplate ParseTemplate(string template)`
`70`	`71`	`$"Invalid template '{template}'. Empty parameter name in segment '{segment}' is not allowed.");`
`71`	`72`	`}`
`72`	`73`
`73`		`- var invalidCharacter = segment.IndexOfAny(InvalidParameterNameCharacters, 1, segment.Length - 2);`
`74`		`- if (invalidCharacter != -1)`
	`74`	`+ var invalidCharacter = segment.AsSpan(1, segment.Length - 2).IndexOfAny(_invalidParameterNameCharacters);`
	`75`	`+ if (invalidCharacter >= 0)`
`75`	`76`	`{`
	`77`	`+ invalidCharacter++; // accommodate the slice above`
`76`	`78`	`throw new InvalidOperationException(`
`77`	`79`	`$"Invalid template '{template}'. The character '{segment[invalidCharacter]}' in parameter segment '{segment}' is not allowed.");`
`78`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -807,7 +807,7 @@ public static RoutePatternParameterPart ParameterPart(string parameterName)`
`807`	`807`	`throw new ArgumentException(Resources.Argument_NullOrEmpty, nameof(parameterName));`
`808`	`808`	`}`
`809`	`809`
`810`		`- if (parameterName.IndexOfAny(RoutePatternParser.InvalidParameterNameChars) >= 0)`
	`810`	`+ if (parameterName.AsSpan().IndexOfAny(RoutePatternParser.InvalidParameterNameChars) >= 0)`
`811`	`811`	`{`
`812`	`812`	`throw new ArgumentException(Resources.FormatTemplateRoute_InvalidParameterName(parameterName));`
`813`	`813`	`}`
`@@ -833,7 +833,7 @@ public static RoutePatternParameterPart ParameterPart(string parameterName, obje`
`833`	`833`	`throw new ArgumentException(Resources.Argument_NullOrEmpty, nameof(parameterName));`
`834`	`834`	`}`
`835`	`835`
`836`		`- if (parameterName.IndexOfAny(RoutePatternParser.InvalidParameterNameChars) >= 0)`
	`836`	`+ if (parameterName.AsSpan().IndexOfAny(RoutePatternParser.InvalidParameterNameChars) >= 0)`
`837`	`837`	`{`
`838`	`838`	`throw new ArgumentException(Resources.FormatTemplateRoute_InvalidParameterName(parameterName));`
`839`	`839`	`}`
`@@ -863,7 +863,7 @@ public static RoutePatternParameterPart ParameterPart(`
`863`	`863`	`throw new ArgumentException(Resources.Argument_NullOrEmpty, nameof(parameterName));`
`864`	`864`	`}`
`865`	`865`
`866`		`- if (parameterName.IndexOfAny(RoutePatternParser.InvalidParameterNameChars) >= 0)`
	`866`	`+ if (parameterName.AsSpan().IndexOfAny(RoutePatternParser.InvalidParameterNameChars) >= 0)`
`867`	`867`	`{`
`868`	`868`	`throw new ArgumentException(Resources.FormatTemplateRoute_InvalidParameterName(parameterName));`
`869`	`869`	`}`
`@@ -900,7 +900,7 @@ public static RoutePatternParameterPart ParameterPart(`
`900`	`900`	`throw new ArgumentException(Resources.Argument_NullOrEmpty, nameof(parameterName));`
`901`	`901`	`}`
`902`	`902`
`903`		`- if (parameterName.IndexOfAny(RoutePatternParser.InvalidParameterNameChars) >= 0)`
	`903`	`+ if (parameterName.AsSpan().IndexOfAny(RoutePatternParser.InvalidParameterNameChars) >= 0)`
`904`	`904`	`{`
`905`	`905`	`throw new ArgumentException(Resources.FormatTemplateRoute_InvalidParameterName(parameterName));`
`906`	`906`	`}`
`@@ -942,7 +942,7 @@ public static RoutePatternParameterPart ParameterPart(`
`942`	`942`	`throw new ArgumentException(Resources.Argument_NullOrEmpty, nameof(parameterName));`
`943`	`943`	`}`
`944`	`944`
`945`		`- if (parameterName.IndexOfAny(RoutePatternParser.InvalidParameterNameChars) >= 0)`
	`945`	`+ if (parameterName.AsSpan().IndexOfAny(RoutePatternParser.InvalidParameterNameChars) >= 0)`
`946`	`946`	`{`
`947`	`947`	`throw new ArgumentException(Resources.FormatTemplateRoute_InvalidParameterName(parameterName));`
`948`	`948`	`}`
Original file line number	Diff line number	Diff line change
`@@ -272,10 +272,12 @@ public static void ValidateHeaderCharacters(string headerCharacters)`
`272`	`272`	`{`
`273`	`273`	`if (headerCharacters != null)`
`274`	`274`	`{`
`275`		`- var invalid = HttpCharacters.IndexOfInvalidFieldValueCharExtended(headerCharacters);`
`276`		`- if (invalid >= 0)`
	`275`	`+ var invalidIndex = HttpCharacters.IndexOfInvalidFieldValueCharExtended(headerCharacters);`
	`276`	`+ if (invalidIndex >= 0)`
`277`	`277`	`{`
`278`		`- throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, "Invalid control character in header: 0x{0:X2}", headerCharacters[invalid]));`
	`278`	`+ Throw(headerCharacters, invalidIndex);`
	`279`	`+ static void Throw(string headerCharacters, int invalidIndex)`
	`280`	`+ => throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, "Invalid control character in header: 0x{0:X2}", headerCharacters[invalidIndex]));`
`279`	`281`	`}`
`280`	`282`	`}`
`281`	`283`	`}`