[release/10.0] Fix performance degradation for primitive collections for multiple parameters translation and deep trees with closure over same variable (#37313)

Author: cincuranet

src/EFCore.Relational/Query/SqlNullabilityProcessor.cs

@@ -23,6 +23,9 @@ public class SqlNullabilityProcessor : ExpressionVisitor
     private static readonly bool UseOldBehavior37204 =
         AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue37204", out var enabled) && enabled;
 
+    private static readonly bool UseOldBehavior37152 =
+        AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue37152", out var enabled) && enabled;
+
     private readonly List<ColumnExpression> _nonNullableColumns;
     private readonly List<ColumnExpression> _nullValueColumns;
     private readonly ISqlExpressionFactory _sqlExpressionFactory;
@@ -2250,7 +2253,11 @@ private static void ExpandParameterIfNeeded(
     {
         if (expandedParameters.Count <= index)
         {
-            var parameterName = Uniquifier.Uniquify(valuesParameterName, parameters, int.MaxValue);
+            var parameterName = UseOldBehavior37152
+                ? Uniquifier.Uniquify(valuesParameterName, parameters, int.MaxValue)
+#pragma warning disable EF1001
+                : Uniquifier.Uniquify(valuesParameterName, parameters, maxLength: int.MaxValue, uniquifier: index + 1);
+#pragma warning restore EF1001
             parameters.Add(parameterName, value);
             var parameterExpression = new SqlParameterExpression(parameterName, value?.GetType() ?? typeof(object), typeMapping);
             expandedParameters.Add(parameterExpression);

src/EFCore/Infrastructure/Uniquifier.cs

@@ -26,7 +26,24 @@ public static string Uniquify<T>(
         string currentIdentifier,
         IReadOnlyDictionary<string, T> otherIdentifiers,
         int maxLength)
-        => Uniquify(currentIdentifier, otherIdentifiers, s => s, maxLength);
+        => Uniquify(currentIdentifier, otherIdentifiers, static s => s, maxLength);
+
+    /// <summary>
+    ///     Creates a unique identifier by appending a number to the given string.
+    /// </summary>
+    /// <typeparam name="T">The type of the object the identifier maps to.</typeparam>
+    /// <param name="currentIdentifier">The base identifier.</param>
+    /// <param name="otherIdentifiers">A dictionary where the identifier will be used as a key.</param>
+    /// <param name="maxLength">The maximum length of the identifier.</param>
+    /// <param name="uniquifier">A starting number for the uniquifier.</param>
+    /// <returns>A unique identifier.</returns>
+    [EntityFrameworkInternal]
+    public static string Uniquify<T>(
+        string currentIdentifier,
+        IReadOnlyDictionary<string, T> otherIdentifiers,
+        int maxLength,
+        int uniquifier)
+        => Uniquify(currentIdentifier, otherIdentifiers, static s => s, suffix: null, maxLength, uniquifier);
 
     /// <summary>
     ///     Creates a unique identifier by appending a number to the given string.
@@ -42,7 +59,7 @@ public static string Uniquify<T>(
         IReadOnlyDictionary<string, T> otherIdentifiers,
         string? suffix,
         int maxLength)
-        => Uniquify(currentIdentifier, otherIdentifiers, s => s, suffix, maxLength);
+        => Uniquify(currentIdentifier, otherIdentifiers, static s => s, suffix, maxLength);
 
     /// <summary>
     ///     Creates a unique identifier by appending a number to the given string.
@@ -61,6 +78,22 @@ public static string Uniquify<TKey, TValue>(
         int maxLength)
         => Uniquify(currentIdentifier, otherIdentifiers, keySelector, suffix: null, maxLength);
 
+    /// <summary>
+    ///     Creates a unique identifier by appending a number to the given string.
+    /// </summary>
+    /// <param name="currentIdentifier">The base identifier.</param>
+    /// <param name="otherIdentifiers">A dictionary where the identifier will be used as part of the key.</param>
+    /// <param name="maxLength">The maximum length of the identifier.</param>
+    /// <param name="uniquifier">A starting number for the uniquifier.</param>
+    /// <returns>A unique identifier.</returns>
+    [EntityFrameworkInternal]
+    public static string Uniquify(
+        string currentIdentifier,
+        ISet<string> otherIdentifiers,
+        int maxLength,
+        int uniquifier)
+        => Uniquify(currentIdentifier, otherIdentifiers, suffix: null, maxLength, uniquifier);
+
     /// <summary>
     ///     Creates a unique identifier by appending a number to the given string.
     /// </summary>
@@ -78,9 +111,30 @@ public static string Uniquify<TKey, TValue>(
         Func<string, TKey> keySelector,
         string? suffix,
         int maxLength)
+        => Uniquify(currentIdentifier, otherIdentifiers, keySelector, suffix, maxLength, uniquifier: 1);
+
+    /// <summary>
+    ///     Creates a unique identifier by appending a number to the given string.
+    /// </summary>
+    /// <typeparam name="TKey">The type of the key that contains the identifier.</typeparam>
+    /// <typeparam name="TValue">The type of the object the identifier maps to.</typeparam>
+    /// <param name="currentIdentifier">The base identifier.</param>
+    /// <param name="otherIdentifiers">A dictionary where the identifier will be used as part of the key.</param>
+    /// <param name="suffix">An optional suffix to add after the uniquifier.</param>
+    /// <param name="keySelector">Creates the key object from an identifier.</param>
+    /// <param name="maxLength">The maximum length of the identifier.</param>
+    /// <param name="uniquifier">A starting number for the uniquifier.</param>
+    /// <returns>A unique identifier.</returns>
+    [EntityFrameworkInternal]
+    public static string Uniquify<TKey, TValue>(
+        string currentIdentifier,
+        IReadOnlyDictionary<TKey, TValue> otherIdentifiers,
+        Func<string, TKey> keySelector,
+        string? suffix,
+        int maxLength,
+        int uniquifier)
     {
         var finalIdentifier = Truncate(currentIdentifier, maxLength, suffix);
-        var uniquifier = 1;
         while (otherIdentifiers.ContainsKey(keySelector(finalIdentifier)))
         {
             finalIdentifier = Truncate(currentIdentifier, maxLength, suffix, uniquifier++);
@@ -102,9 +156,26 @@ public static string Uniquify(
         ISet<string> otherIdentifiers,
         string? suffix,
         int maxLength)
+        => Uniquify(currentIdentifier, otherIdentifiers, suffix, maxLength, uniquifier: 1);
+
+    /// <summary>
+    ///     Creates a unique identifier by appending a number to the given string.
+    /// </summary>
+    /// <param name="currentIdentifier">The base identifier.</param>
+    /// <param name="otherIdentifiers">A dictionary where the identifier will be used as part of the key.</param>
+    /// <param name="suffix">An optional suffix to add after the uniquifier.</param>
+    /// <param name="maxLength">The maximum length of the identifier.</param>
+    /// <param name="uniquifier">A starting number for the uniquifier.</param>
+    /// <returns>A unique identifier.</returns>
+    [EntityFrameworkInternal]
+    public static string Uniquify(
+        string currentIdentifier,
+        ISet<string> otherIdentifiers,
+        string? suffix,
+        int maxLength,
+        int uniquifier)
     {
         var finalIdentifier = Truncate(currentIdentifier, maxLength, suffix);
-        var uniquifier = 1;
         while (otherIdentifiers.Contains(finalIdentifier))
         {
             finalIdentifier = Truncate(currentIdentifier, maxLength, suffix, uniquifier++);

src/EFCore/Query/Internal/ExpressionTreeFuncletizer.cs

@@ -22,6 +22,9 @@ namespace Microsoft.EntityFrameworkCore.Query.Internal;
 /// </remarks>
 public class ExpressionTreeFuncletizer : ExpressionVisitor
 {
+    private static readonly bool UseOldBehavior37152 =
+        AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue37152", out var enabled) && enabled;
+
     // The general algorithm here is the following.
     // 1. First, for each node type, visit that node's children and get their states (evaluatable, contains evaluatable, no evaluatable).
     // 2. Calculate the parent node's aggregate state from its children; a container node whose children are all evaluatable is itself
@@ -2091,11 +2094,18 @@ bool PreserveConvertNode(Expression expression)
                 parameterName = parameterName.Substring("$VB$Local_".Length);
             }
 
-            // Uniquify the parameter name
-            var originalParameterName = parameterName;
-            for (var i = 0; _parameterNames.Contains(parameterName); i++)
+            if (UseOldBehavior37152)
+            {
+                // Uniquify the parameter name
+                var originalParameterName = parameterName;
+                for (var i = 0; _parameterNames.Contains(parameterName); i++)
+                {
+                    parameterName = originalParameterName + i;
+                }
+            }
+            else
             {
-                parameterName = originalParameterName + i;
+                parameterName = Uniquifier.Uniquify(parameterName, _parameterNames, maxLength: int.MaxValue, uniquifier: _parameterNames.Count);
             }
 
             _parameterNames.Add(parameterName);

test/EFCore.Cosmos.FunctionalTests/Query/FromSqlQueryCosmosTest.cs

@@ -789,15 +789,15 @@ await AssertQuery(
                     """
 @p='London'
 @p0='UK'
-@p00='1'
-@p1='5'
+@p1='1'
+@p2='5'
 
 SELECT VALUE s
 FROM (
     SELECT * FROM root c WHERE c["City"] = @p AND c["Country"] = @p0
 ) s
 ORDER BY s["id"]
-OFFSET @p00 LIMIT @p1
+OFFSET @p1 LIMIT @p2
 """);
             });
 

test/EFCore.Cosmos.FunctionalTests/Query/NorthwindMiscellaneousQueryCosmosTest.cs

@@ -558,12 +558,12 @@ public override Task Skip_Take(bool async)
                 AssertSql(
                     """
 @p='5'
-@p0='10'
+@p1='10'
 
 SELECT VALUE c
 FROM root c
 ORDER BY c["ContactName"]
-OFFSET @p LIMIT @p0
+OFFSET @p LIMIT @p1
 """);
             });
 
@@ -1299,13 +1299,13 @@ public override async Task Skip_Take_Any(bool async)
             AssertSql(
                 """
 @p='5'
-@p0='10'
+@p1='10'
 
 SELECT VALUE EXISTS (
     SELECT 1
     FROM root c
     ORDER BY c["ContactName"]
-    OFFSET @p LIMIT @p0)
+    OFFSET @p LIMIT @p1)
 """);
         }
     }
@@ -2292,12 +2292,12 @@ public override async Task OrderBy_skip_take(bool async)
             AssertSql(
                 """
 @p='5'
-@p0='8'
+@p1='8'
 
 SELECT VALUE c
 FROM root c
 ORDER BY c["ContactTitle"], c["ContactName"]
-OFFSET @p LIMIT @p0
+OFFSET @p LIMIT @p1
 """);
         }
     }
@@ -3019,12 +3019,12 @@ public override Task OrderBy_Dto_projection_skip_take(bool async)
                 AssertSql(
                     """
 @p='5'
-@p0='10'
+@p1='10'
 
 SELECT VALUE c["id"]
 FROM root c
 ORDER BY c["id"]
-OFFSET @p LIMIT @p0
+OFFSET @p LIMIT @p1
 """);
             });
 

test/EFCore.Cosmos.FunctionalTests/Query/NorthwindWhereQueryCosmosTest.cs

@@ -1538,11 +1538,11 @@ public override Task Two_parameters_with_same_name_get_uniquified(bool async)
                 AssertSql(
                     """
 @customerId='ANATR'
-@customerId0='ALFKI'
+@customerId1='ALFKI'
 
 SELECT VALUE c
 FROM root c
-WHERE ((c["id"] = @customerId) OR (c["id"] = @customerId0))
+WHERE ((c["id"] = @customerId) OR (c["id"] = @customerId1))
 """);
             });
 

test/EFCore.Cosmos.FunctionalTests/Query/OwnedQueryCosmosTest.cs

@@ -979,13 +979,13 @@ public override Task Client_method_skip_take_loads_owned_navigations_variation_2
                 AssertSql(
                     """
 @p='1'
-@p0='2'
+@p1='2'
 
 SELECT VALUE c
 FROM root c
 WHERE c["Terminator"] IN ("OwnedPerson", "Branch", "LeafB", "LeafA")
 ORDER BY c["Id"]
-OFFSET @p LIMIT @p0
+OFFSET @p LIMIT @p1
 """);
             });
 
@@ -998,13 +998,13 @@ public override Task Client_method_skip_take_loads_owned_navigations(bool async)
                 AssertSql(
                     """
 @p='1'
-@p0='2'
+@p1='2'
 
 SELECT VALUE c
 FROM root c
 WHERE c["Terminator"] IN ("OwnedPerson", "Branch", "LeafB", "LeafA")
 ORDER BY c["Id"]
-OFFSET @p LIMIT @p0
+OFFSET @p LIMIT @p1
 """);
             });
 

test/EFCore.Cosmos.FunctionalTests/Query/Translations/VectorSearchTranslationsCosmosTest.cs

@@ -273,11 +273,11 @@ public virtual async Task RRF_with_two_Vector_distance_functions_in_OrderBy()
         AssertSql(
             """
 @p='[2,1,4,6,5,2,5,7,3,1]'
-@p0='[0.33,-0.52,0.45,-0.67,0.89,-0.34,0.86,-0.78]'
+@p3='[0.33,-0.52,0.45,-0.67,0.89,-0.34,0.86,-0.78]'
 
 SELECT VALUE c
 FROM root c
-ORDER BY RANK RRF(VectorDistance(c["BytesArray"], @p), VectorDistance(c["SinglesArray"], @p0))
+ORDER BY RANK RRF(VectorDistance(c["BytesArray"], @p), VectorDistance(c["SinglesArray"], @p3))
 """);
     }