Work in progress.

rstam · rstam · commit a61c24375522 · 2025-09-26T13:43:23.000-07:00
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/KnownSerializerFinders/KnownSerializerFinder.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/KnownSerializerFinders/KnownSerializerFinder.cs
@@ -21,24 +21,27 @@ namespace MongoDB.Driver.Linq.Linq3Implementation.KnownSerializerFinders;
 internal static class KnownSerializerFinder
 {
     public static KnownSerializerMap FindKnownSerializers(
-        Expression expression)
+        Expression expression,
+        ExpressionTranslationOptions translationOptions)
     {
         var knownSerializers = new KnownSerializerMap();
-        return FindKnownSerializers(expression, knownSerializers);
+        return FindKnownSerializers(expression, translationOptions, knownSerializers);
     }
 
     public static KnownSerializerMap FindKnownSerializers(
         Expression expression,
+        ExpressionTranslationOptions translationOptions,
         Expression initialNode,
         IBsonSerializer knownSerializer)
     {
         var knownSerializers = new KnownSerializerMap();
         knownSerializers.AddSerializer(initialNode, knownSerializer);
-        return FindKnownSerializers(expression, knownSerializers);
+        return FindKnownSerializers(expression, translationOptions, knownSerializers);
     }
 
     public static KnownSerializerMap FindKnownSerializers(
         Expression expression,
+        ExpressionTranslationOptions translationOptions,
         (Expression Node, IBsonSerializer KnownSerializer)[] initialNodes)
     {
         var knownSerializers = new KnownSerializerMap();
@@ -47,14 +50,15 @@ public static KnownSerializerMap FindKnownSerializers(
             knownSerializers.AddSerializer(initialNode, knownSerializer);
 
         }
-        return FindKnownSerializers(expression, knownSerializers);
+        return FindKnownSerializers(expression, translationOptions, knownSerializers);
     }
 
     public static KnownSerializerMap FindKnownSerializers(
         Expression expression,
+        ExpressionTranslationOptions translationOptions,
         KnownSerializerMap knownSerializers)
     {
-        var visitor = new KnownSerializerFinderVisitor(knownSerializers);
+        var visitor = new KnownSerializerFinderVisitor(translationOptions, knownSerializers);
 
         int oldSerializerCount;
         int newSerializerCount;
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/KnownSerializerFinders/KnownSerializerFinderHelperMethods.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/KnownSerializerFinders/KnownSerializerFinderHelperMethods.cs
@@ -21,6 +21,7 @@
 using MongoDB.Bson.Serialization.Serializers;
 using MongoDB.Driver.Linq.Linq3Implementation.Misc;
 using MongoDB.Driver.Linq.Linq3Implementation.Serializers;
+using IOrderedEnumerableSerializer=MongoDB.Driver.Linq.Linq3Implementation.Serializers.IOrderedEnumerableSerializer;
 
 namespace MongoDB.Driver.Linq.Linq3Implementation.KnownSerializerFinders;
 
@@ -93,6 +94,7 @@ IBsonSerializer CreateCollectionSerializerFromItemSerializer(Type type, IBsonSer
         {
             _ when type.IsArray => ArraySerializer.Create(itemSerializer),
             _ when type.IsConstructedGenericType && type.GetGenericTypeDefinition() == typeof(IEnumerable<>) => IEnumerableSerializer.Create(itemSerializer),
+            _ when type.IsConstructedGenericType && type.GetGenericTypeDefinition() == typeof(IOrderedEnumerable<>) => IOrderedEnumerableSerializer.Create(itemSerializer),
             _ when type.IsConstructedGenericType && type.GetGenericTypeDefinition() == typeof(IQueryable<>) => IQueryableSerializer.Create(itemSerializer),
             _ => (BsonSerializer.LookupSerializer(type) as IChildSerializerConfigurable)?.WithChildSerializer(itemSerializer)
         };
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/KnownSerializerFinders/KnownSerializerFinderVisitMethodCall.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/KnownSerializerFinders/KnownSerializerFinderVisitMethodCall.cs
@@ -654,7 +654,25 @@ protected override Expression VisitMethodCall(MethodCallExpression node)
         var arguments = node.Arguments;
 
         DeduceMethodCallSerializers();
-        base.VisitMethodCall(node);
+        try
+        {
+            base.VisitMethodCall(node);
+        }
+        catch
+        {
+            if (node.Method.Is(QueryableMethod.Select) && (_translationOptions.EnableClientSideProjections ?? false))
+            {
+                var sourceExpression = arguments[0];
+                if (IsItemSerializerKnown(sourceExpression, out var sourceItemSerializer))
+                {
+                    AddKnownSerializer(node, IgnoreSubtreeSerializer.Create(node.Type));
+                }
+            }
+            else
+            {
+                throw;
+            }
+        }
         DeduceMethodCallSerializers();
 
         return node;
@@ -820,6 +838,9 @@ void DeduceMethodCallSerializers()
                 case "ToUpperInvariant":
                     DeduceToLowerOrToUpperSerializers();
                     break;
+
+                default:
+                    throw new ExpressionNotSupportedException(node, because: $"method {method.Name} is not supported");
             }
         }
 
@@ -1965,7 +1986,7 @@ void DeduceOrderByMethodSerializers()
                 var keySelectorParameter = keySelectorLambda.Parameters.Single();
 
                 DeduceItemAndCollectionSerializers(keySelectorParameter, sourceExpression);
-                DeduceSerializers(node, sourceExpression);
+                DeduceCollectionAndCollectionSerializers(node, sourceExpression);
             }
         }
 
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/KnownSerializerFinders/KnownSerializerFinderVisitor.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/KnownSerializerFinders/KnownSerializerFinderVisitor.cs
@@ -27,10 +27,12 @@ internal partial class KnownSerializerFinderVisitor : ExpressionVisitor
 {
     private readonly KnownSerializerMap _knownSerializers;
     private int _pass = 0;
+    private readonly ExpressionTranslationOptions _translationOptions;
 
-    public KnownSerializerFinderVisitor(KnownSerializerMap knownSerializers)
+    public KnownSerializerFinderVisitor(ExpressionTranslationOptions translationOptions, KnownSerializerMap knownSerializers)
     {
         _knownSerializers = knownSerializers;
+        _translationOptions = translationOptions;
     }
 
     public int Pass => _pass;
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Misc/IBsonSerializerExtensions.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Misc/IBsonSerializerExtensions.cs
@@ -35,6 +35,11 @@ public static bool CanBeAssignedTo(this IBsonSerializer sourceSerializer, IBsonS
             return true;
         }
 
+        if (targetSerializer.ValueType.IsAssignableFrom(sourceSerializer.ValueType))
+        {
+            return true;
+        }
+
         return false;
     }
 
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Reflection/TupleOrValueTupleConstructor.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Reflection/TupleOrValueTupleConstructor.cs
@@ -22,8 +22,9 @@ internal static class TupleOrValueTupleConstructor
 {
     public static bool IsTupleOrValueTupleConstructor(ConstructorInfo constructor)
     {
-        var declaringType = constructor.DeclaringType;
         return
+            constructor != null &&
+            constructor.DeclaringType is var declaringType &&
             declaringType.Namespace == "System" &&
             (declaringType.Name.StartsWith("Tuple") || declaringType.Name.StartsWith("ValueTuple"));
     }
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/WhereMethodToAggregationExpressionTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/WhereMethodToAggregationExpressionTranslator.cs
@@ -70,7 +70,8 @@ public static TranslatedExpression Translate(TranslationContext context, MethodC
                     @as: predicateSymbol.Var.Name,
                     limitTranslation?.Ast);
 
-                var resultSerializer = NestedAsQueryableSerializer.CreateIEnumerableOrNestedAsQueryableSerializer(expression.Type, itemSerializer);
+                // var resultSerializer = NestedAsQueryableSerializer.CreateIEnumerableOrNestedAsQueryableSerializer(expression.Type, itemSerializer);
+                var resultSerializer = context.KnownSerializers.GetSerializer(expression);
                 return new TranslatedExpression(expression, ast, resultSerializer);
             }
 
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/TranslationContext.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/TranslationContext.cs
@@ -34,7 +34,7 @@ public static TranslationContext Create(
             ExpressionTranslationOptions translationOptions,
             TranslationContextData data = null)
         {
-            var knownSerializers = KnownSerializerFinder.FindKnownSerializers(expression);
+            var knownSerializers = KnownSerializerFinder.FindKnownSerializers(expression, translationOptions);
             return Create(translationOptions, knownSerializers, data);
         }
 
@@ -56,7 +56,7 @@ public static TranslationContext Create(
             ExpressionTranslationOptions translationOptions,
             TranslationContextData data = null)
         {
-            var knownSerializers = KnownSerializerFinder.FindKnownSerializers(expression, initialNode, initialSerializer);
+            var knownSerializers = KnownSerializerFinder.FindKnownSerializers(expression, translationOptions, initialNode, initialSerializer);
             return Create(translationOptions, knownSerializers, data);
         }
 
@@ -66,7 +66,7 @@ public static TranslationContext Create(
             ExpressionTranslationOptions translationOptions,
             TranslationContextData data = null)
         {
-            var knownSerializers = KnownSerializerFinder.FindKnownSerializers(expression, initialKnownSerializers);
+            var knownSerializers = KnownSerializerFinder.FindKnownSerializers(expression, translationOptions, initialKnownSerializers);
             return Create(translationOptions, knownSerializers, data);
         }
 
diff --git a/src/MongoDB.Driver/Linq/LinqProviderAdapter.cs b/src/MongoDB.Driver/Linq/LinqProviderAdapter.cs
@@ -224,12 +224,11 @@ internal static BsonDocument TranslateExpressionToSetStage<TDocument, TFields>(
 
             var knownSerializers = new KnownSerializerMap();
             knownSerializers.AddSerializer(parameter, documentSerializer);
-            if (body is MemberInitExpression memberInitExpression &&
-                memberInitExpression.Type == typeof(TDocument))
+            if (body.Type == typeof(TDocument))
             {
-                knownSerializers.AddSerializer(memberInitExpression, documentSerializer);
+                knownSerializers.AddSerializer(body, documentSerializer);
             }
-            KnownSerializerFinder.FindKnownSerializers(expression, knownSerializers);
+            KnownSerializerFinder.FindKnownSerializers(expression, translationOptions, knownSerializers);
 
             var context = TranslationContext.Create(translationOptions, knownSerializers); // do not partially evaluate expression
             var symbol = context.CreateRootSymbol(parameter, documentSerializer);

Original file line number	Diff line number	Diff line change
`@@ -21,24 +21,27 @@ namespace MongoDB.Driver.Linq.Linq3Implementation.KnownSerializerFinders;`
`21`	`21`	`internal static class KnownSerializerFinder`
`22`	`22`	`{`
`23`	`23`	`public static KnownSerializerMap FindKnownSerializers(`
`24`		`- Expression expression)`
	`24`	`+ Expression expression,`
	`25`	`+ ExpressionTranslationOptions translationOptions)`
`25`	`26`	`{`
`26`	`27`	`var knownSerializers = new KnownSerializerMap();`
`27`		`- return FindKnownSerializers(expression, knownSerializers);`
	`28`	`+ return FindKnownSerializers(expression, translationOptions, knownSerializers);`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`public static KnownSerializerMap FindKnownSerializers(`
`31`	`32`	`Expression expression,`
	`33`	`+ ExpressionTranslationOptions translationOptions,`
`32`	`34`	`Expression initialNode,`
`33`	`35`	`IBsonSerializer knownSerializer)`
`34`	`36`	`{`
`35`	`37`	`var knownSerializers = new KnownSerializerMap();`
`36`	`38`	`knownSerializers.AddSerializer(initialNode, knownSerializer);`
`37`		`- return FindKnownSerializers(expression, knownSerializers);`
	`39`	`+ return FindKnownSerializers(expression, translationOptions, knownSerializers);`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`public static KnownSerializerMap FindKnownSerializers(`
`41`	`43`	`Expression expression,`
	`44`	`+ ExpressionTranslationOptions translationOptions,`
`42`	`45`	`(Expression Node, IBsonSerializer KnownSerializer)[] initialNodes)`
`43`	`46`	`{`
`44`	`47`	`var knownSerializers = new KnownSerializerMap();`
`@@ -47,14 +50,15 @@ public static KnownSerializerMap FindKnownSerializers(`
`47`	`50`	`knownSerializers.AddSerializer(initialNode, knownSerializer);`
`48`	`51`
`49`	`52`	`}`
`50`		`- return FindKnownSerializers(expression, knownSerializers);`
	`53`	`+ return FindKnownSerializers(expression, translationOptions, knownSerializers);`
`51`	`54`	`}`
`52`	`55`
`53`	`56`	`public static KnownSerializerMap FindKnownSerializers(`
`54`	`57`	`Expression expression,`
	`58`	`+ ExpressionTranslationOptions translationOptions,`
`55`	`59`	`KnownSerializerMap knownSerializers)`
`56`	`60`	`{`
`57`		`- var visitor = new KnownSerializerFinderVisitor(knownSerializers);`
	`61`	`+ var visitor = new KnownSerializerFinderVisitor(translationOptions, knownSerializers);`
`58`	`62`
`59`	`63`	`int oldSerializerCount;`
`60`	`64`	`int newSerializerCount;`
Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,12 @@ internal partial class KnownSerializerFinderVisitor : ExpressionVisitor`
`27`	`27`	`{`
`28`	`28`	`private readonly KnownSerializerMap _knownSerializers;`
`29`	`29`	`private int _pass = 0;`
	`30`	`+ private readonly ExpressionTranslationOptions _translationOptions;`
`30`	`31`
`31`		`- public KnownSerializerFinderVisitor(KnownSerializerMap knownSerializers)`
	`32`	`+ public KnownSerializerFinderVisitor(ExpressionTranslationOptions translationOptions, KnownSerializerMap knownSerializers)`
`32`	`33`	`{`
`33`	`34`	`_knownSerializers = knownSerializers;`
	`35`	`+ _translationOptions = translationOptions;`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`public int Pass => _pass;`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,11 @@ public static bool CanBeAssignedTo(this IBsonSerializer sourceSerializer, IBsonS`
`35`	`35`	`return true;`
`36`	`36`	`}`
`37`	`37`
	`38`	`+ if (targetSerializer.ValueType.IsAssignableFrom(sourceSerializer.ValueType))`
	`39`	`+ {`
	`40`	`+ return true;`
	`41`	`+ }`
	`42`	`+`
`38`	`43`	`return false;`
`39`	`44`	`}`
`40`	`45`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,9 @@ internal static class TupleOrValueTupleConstructor`
`22`	`22`	`{`
`23`	`23`	`public static bool IsTupleOrValueTupleConstructor(ConstructorInfo constructor)`
`24`	`24`	`{`
`25`		`- var declaringType = constructor.DeclaringType;`
`26`	`25`	`return`
	`26`	`+ constructor != null &&`
	`27`	`+ constructor.DeclaringType is var declaringType &&`
`27`	`28`	`declaringType.Namespace == "System" &&`
`28`	`29`	`(declaringType.Name.StartsWith("Tuple") \|\| declaringType.Name.StartsWith("ValueTuple"));`
`29`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,8 @@ public static TranslatedExpression Translate(TranslationContext context, MethodC`
`70`	`70`	`@as: predicateSymbol.Var.Name,`
`71`	`71`	`limitTranslation?.Ast);`
`72`	`72`
`73`		`- var resultSerializer = NestedAsQueryableSerializer.CreateIEnumerableOrNestedAsQueryableSerializer(expression.Type, itemSerializer);`
	`73`	`+ // var resultSerializer = NestedAsQueryableSerializer.CreateIEnumerableOrNestedAsQueryableSerializer(expression.Type, itemSerializer);`
	`74`	`+ var resultSerializer = context.KnownSerializers.GetSerializer(expression);`
`74`	`75`	`return new TranslatedExpression(expression, ast, resultSerializer);`
`75`	`76`	`}`
`76`	`77`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public static TranslationContext Create(`
`34`	`34`	`ExpressionTranslationOptions translationOptions,`
`35`	`35`	`TranslationContextData data = null)`
`36`	`36`	`{`
`37`		`- var knownSerializers = KnownSerializerFinder.FindKnownSerializers(expression);`
	`37`	`+ var knownSerializers = KnownSerializerFinder.FindKnownSerializers(expression, translationOptions);`
`38`	`38`	`return Create(translationOptions, knownSerializers, data);`
`39`	`39`	`}`
`40`	`40`
`@@ -56,7 +56,7 @@ public static TranslationContext Create(`
`56`	`56`	`ExpressionTranslationOptions translationOptions,`
`57`	`57`	`TranslationContextData data = null)`
`58`	`58`	`{`
`59`		`- var knownSerializers = KnownSerializerFinder.FindKnownSerializers(expression, initialNode, initialSerializer);`
	`59`	`+ var knownSerializers = KnownSerializerFinder.FindKnownSerializers(expression, translationOptions, initialNode, initialSerializer);`
`60`	`60`	`return Create(translationOptions, knownSerializers, data);`
`61`	`61`	`}`
`62`	`62`
`@@ -66,7 +66,7 @@ public static TranslationContext Create(`
`66`	`66`	`ExpressionTranslationOptions translationOptions,`
`67`	`67`	`TranslationContextData data = null)`
`68`	`68`	`{`
`69`		`- var knownSerializers = KnownSerializerFinder.FindKnownSerializers(expression, initialKnownSerializers);`
	`69`	`+ var knownSerializers = KnownSerializerFinder.FindKnownSerializers(expression, translationOptions, initialKnownSerializers);`
`70`	`70`	`return Create(translationOptions, knownSerializers, data);`
`71`	`71`	`}`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -224,12 +224,11 @@ internal static BsonDocument TranslateExpressionToSetStage<TDocument, TFields>(`
`224`	`224`
`225`	`225`	`var knownSerializers = new KnownSerializerMap();`
`226`	`226`	`knownSerializers.AddSerializer(parameter, documentSerializer);`
`227`		`- if (body is MemberInitExpression memberInitExpression &&`
`228`		`- memberInitExpression.Type == typeof(TDocument))`
	`227`	`+ if (body.Type == typeof(TDocument))`
`229`	`228`	`{`
`230`		`- knownSerializers.AddSerializer(memberInitExpression, documentSerializer);`
	`229`	`+ knownSerializers.AddSerializer(body, documentSerializer);`
`231`	`230`	`}`
`232`		`- KnownSerializerFinder.FindKnownSerializers(expression, knownSerializers);`
	`231`	`+ KnownSerializerFinder.FindKnownSerializers(expression, translationOptions, knownSerializers);`
`233`	`232`
`234`	`233`	`var context = TranslationContext.Create(translationOptions, knownSerializers); // do not partially evaluate expression`
`235`	`234`	`var symbol = context.CreateRootSymbol(parameter, documentSerializer);`