Skip to content

Commit 757fd0e

Browse files
rstamrstam
committed
CSHARP-5461: Added targetSerializer to AggregateMethodToAggregationExpressionTranslator.
1 parent bd0a2aa commit 757fd0e

File tree

4 files changed

+110
-45
lines changed

4 files changed

+110
-45
lines changed

‎src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/ExpressionToAggregationExpressionTranslator.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static AggregationExpression Translate(TranslationContext context, Expres
6363
case ExpressionType.ArrayLength:
6464
return ArrayLengthExpressionToAggregationExpressionTranslator.Translate(context, (UnaryExpression)expression);
6565
case ExpressionType.Call:
66-
return MethodCallExpressionToAggregationExpressionTranslator.Translate(context, (MethodCallExpression)expression);
66+
return MethodCallExpressionToAggregationExpressionTranslator.Translate(context, (MethodCallExpression)expression, targetSerializer);
6767
case ExpressionType.Conditional:
6868
return ConditionalExpressionToAggregationExpressionTranslator.Translate(context, (ConditionalExpression)expression);
6969
case ExpressionType.Constant:
@@ -91,19 +91,19 @@ public static AggregationExpression Translate(TranslationContext context, Expres
9191
throw new ExpressionNotSupportedException(expression);
9292
}
9393

94-
public static AggregationExpression TranslateEnumerable(TranslationContext context, Expression expression)
94+
public static AggregationExpression TranslateEnumerable(TranslationContext context, Expression expression, IBsonSerializer targetSerializer = null)
9595
{
96-
var aggregateExpression = Translate(context, expression);
96+
var aggregateExpression = Translate(context, expression, targetSerializer);
9797

98-
var serializer = aggregateExpression.Serializer;
99-
if (serializer is IWrappedEnumerableSerializer wrappedEnumerableSerializer)
98+
var resultSerializer = aggregateExpression.Serializer;
99+
if (resultSerializer is IWrappedEnumerableSerializer wrappedEnumerableSerializer)
100100
{
101101
var enumerableFieldName = wrappedEnumerableSerializer.EnumerableFieldName;
102-
var enumerableElementSerializer = wrappedEnumerableSerializer.EnumerableElementSerializer;
103-
var enumerableSerializer = IEnumerableSerializer.Create(enumerableElementSerializer);
104-
var ast = AstExpression.GetField(aggregateExpression.Ast, enumerableFieldName);
102+
var itemSerializer = wrappedEnumerableSerializer.EnumerableElementSerializer;
105103

106-
return new AggregationExpression(aggregateExpression.Expression, ast, enumerableSerializer);
104+
var ast = AstExpression.GetField(aggregateExpression.Ast, enumerableFieldName);
105+
resultSerializer = IEnumerableSerializer.Create(itemSerializer);
106+
return new AggregationExpression(aggregateExpression.Expression, ast, resultSerializer);
107107
}
108108

109109
return aggregateExpression;

‎src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodCallExpressionToAggregationExpressionTranslator.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,21 @@
1414
*/
1515

1616
using System.Linq.Expressions;
17+
using MongoDB.Bson.Serialization;
1718
using MongoDB.Driver.Linq.Linq3Implementation.Translators.ExpressionToAggregationExpressionTranslators.MethodTranslators;
1819

1920
namespace MongoDB.Driver.Linq.Linq3Implementation.Translators.ExpressionToAggregationExpressionTranslators
2021
{
2122
internal static class MethodCallExpressionToAggregationExpressionTranslator
2223
{
23-
public static AggregationExpression Translate(TranslationContext context, MethodCallExpression expression)
24+
public static AggregationExpression Translate(TranslationContext context, MethodCallExpression expression, IBsonSerializer targetSerializer)
2425
{
2526
switch (expression.Method.Name)
2627
{
2728
case "Abs": return AbsMethodToAggregationExpressionTranslator.Translate(context, expression);
2829
case "Add": return AddMethodToAggregationExpressionTranslator.Translate(context, expression);
2930
case "AddToSet": return AddToSetMethodToAggregationExpressionTranslator.Translate(context, expression);
30-
case "Aggregate": return AggregateMethodToAggregationExpressionTranslator.Translate(context, expression);
31+
case "Aggregate": return AggregateMethodToAggregationExpressionTranslator.Translate(context, expression, targetSerializer);
3132
case "All": return AllMethodToAggregationExpressionTranslator.Translate(context, expression);
3233
case "Any": return AnyMethodToAggregationExpressionTranslator.Translate(context, expression);
3334
case "AsQueryable": return AsQueryableMethodToAggregationExpressionTranslator.Translate(context, expression);

‎src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/AggregateMethodToAggregationExpressionTranslator.cs

Lines changed: 78 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
using MongoDB.Driver.Linq.Linq3Implementation.Ast.Expressions;
2020
using MongoDB.Driver.Linq.Linq3Implementation.Misc;
2121
using MongoDB.Driver.Linq.Linq3Implementation.Reflection;
22+
using MongoDB.Driver.Linq.Linq3Implementation.Serializers;
2223

2324
namespace MongoDB.Driver.Linq.Linq3Implementation.Translators.ExpressionToAggregationExpressionTranslators.MethodTranslators
2425
{
@@ -34,39 +35,46 @@ internal static class AggregateMethodToAggregationExpressionTranslator
3435
QueryableMethod.AggregateWithSeedFuncAndResultSelector
3536
};
3637

37-
private static readonly MethodInfo[] __aggregateWithoutSeedMethods =
38+
private static readonly MethodInfo[] __aggregateWithFuncMethods =
3839
{
3940
EnumerableMethod.AggregateWithFunc,
4041
QueryableMethod.AggregateWithFunc
4142
};
4243

43-
private static readonly MethodInfo[] __aggregateWithSeedMethods =
44+
private static readonly MethodInfo[] __aggregateWithSeedAndFuncMethods =
4445
{
4546
EnumerableMethod.AggregateWithSeedAndFunc,
47+
QueryableMethod.AggregateWithSeedAndFunc
48+
};
49+
50+
private static readonly MethodInfo[] __aggregateWithSeedAndFuncAndResultSelectorMethods =
51+
{
4652
EnumerableMethod.AggregateWithSeedFuncAndResultSelector,
47-
QueryableMethod.AggregateWithSeedAndFunc,
4853
QueryableMethod.AggregateWithSeedFuncAndResultSelector
4954
};
5055

51-
private static readonly MethodInfo[] __aggregateWithSeedFuncAndResultSelectorMethods =
52-
{
56+
private static readonly MethodInfo[] __aggregateIncludingSeedMethods =
57+
{
58+
EnumerableMethod.AggregateWithSeedAndFunc,
5359
EnumerableMethod.AggregateWithSeedFuncAndResultSelector,
60+
QueryableMethod.AggregateWithSeedAndFunc,
5461
QueryableMethod.AggregateWithSeedFuncAndResultSelector
5562
};
5663

57-
public static AggregationExpression Translate(TranslationContext context, MethodCallExpression expression)
64+
public static AggregationExpression Translate(TranslationContext context, MethodCallExpression expression, IBsonSerializer targetSerializer)
5865
{
5966
var method = expression.Method;
6067
var arguments = expression.Arguments;
6168

6269
if (method.IsOneOf(__aggregateMethods))
6370
{
6471
var sourceExpression = arguments[0];
65-
var sourceTranslation = ExpressionToAggregationExpressionTranslator.TranslateEnumerable(context, sourceExpression);
72+
var sourceTargetSerializer = GetSourceTargetSerializer(method, targetSerializer);
73+
var sourceTranslation = ExpressionToAggregationExpressionTranslator.TranslateEnumerable(context, sourceExpression, sourceTargetSerializer);
6674
NestedAsQueryableHelper.EnsureQueryableMethodHasNestedAsQueryableSource(expression, sourceTranslation);
6775
var itemSerializer = ArraySerializerHelper.GetItemSerializer(sourceTranslation.Serializer);
6876

69-
if (method.IsOneOf(__aggregateWithoutSeedMethods))
77+
if (method.IsOneOf(__aggregateWithFuncMethods))
7078
{
7179
var funcLambda = ExpressionHelper.UnquoteLambdaIfQueryableMethod(method, arguments[1]);
7280
var funcParameters = funcLambda.Parameters;
@@ -75,7 +83,8 @@ public static AggregationExpression Translate(TranslationContext context, Method
7583
var itemParameter = funcParameters[1];
7684
var itemSymbol = context.CreateSymbolWithVarName(itemParameter, varName: "this", itemSerializer); // note: MQL uses $$this for the item being processed
7785
var funcContext = context.WithSymbols(accumulatorSymbol, itemSymbol);
78-
var funcTranslation = ExpressionToAggregationExpressionTranslator.Translate(funcContext, funcLambda.Body);
86+
var funcTargetSerializer = GetFuncTargetSerializer(method, targetSerializer);
87+
var funcTranslation = ExpressionToAggregationExpressionTranslator.Translate(funcContext, funcLambda.Body, funcTargetSerializer);
7988

8089
var (sourceVarBinding, sourceAst) = AstExpression.UseVarIfNotSimple("source", sourceTranslation.Ast);
8190
var seedVar = AstExpression.Var("seed");
@@ -95,10 +104,11 @@ public static AggregationExpression Translate(TranslationContext context, Method
95104

96105
return new AggregationExpression(expression, ast, itemSerializer);
97106
}
98-
else if (method.IsOneOf(__aggregateWithSeedMethods))
107+
else if (method.IsOneOf(__aggregateIncludingSeedMethods))
99108
{
100109
var seedExpression = arguments[1];
101-
var seedTranslation = ExpressionToAggregationExpressionTranslator.Translate(context, seedExpression);
110+
var seedTargetSerializer = GetSeedTargetSerializer(method, targetSerializer);
111+
var seedTranslation = ExpressionToAggregationExpressionTranslator.Translate(context, seedExpression, seedTargetSerializer);
102112

103113
var funcLambda = ExpressionHelper.UnquoteLambdaIfQueryableMethod(method, arguments[2]);
104114
var funcParameters = funcLambda.Parameters;
@@ -108,21 +118,23 @@ public static AggregationExpression Translate(TranslationContext context, Method
108118
var itemParameter = funcParameters[1];
109119
var itemSymbol = context.CreateSymbolWithVarName(itemParameter, varName: "this", itemSerializer); // note: MQL uses $$this for the item being processed
110120
var funcContext = context.WithSymbols(accumulatorSymbol, itemSymbol);
111-
var funcTranslation = ExpressionToAggregationExpressionTranslator.Translate(funcContext, funcLambda.Body);
121+
var funcTargetSerializer = GetFuncTargetSerializer(method, targetSerializer);
122+
var funcTranslation = ExpressionToAggregationExpressionTranslator.Translate(funcContext, funcLambda.Body, funcTargetSerializer);
112123

113124
var ast = AstExpression.Reduce(
114125
input: sourceTranslation.Ast,
115126
initialValue: seedTranslation.Ast,
116127
@in: funcTranslation.Ast);
117128
var serializer = accumulatorSerializer;
118129

119-
if (method.IsOneOf(__aggregateWithSeedFuncAndResultSelectorMethods))
130+
if (method.IsOneOf(__aggregateWithSeedAndFuncAndResultSelectorMethods))
120131
{
121132
var resultSelectorLambda = ExpressionHelper.UnquoteLambdaIfQueryableMethod(method, arguments[3]);
122133
var resultSelectorAccumulatorParameter = resultSelectorLambda.Parameters[0];
123134
var resultSelectorAccumulatorSymbol = context.CreateSymbol(resultSelectorAccumulatorParameter, accumulatorSerializer);
124135
var resultSelectorContext = context.WithSymbol(resultSelectorAccumulatorSymbol);
125-
var resultSelectorTranslation = ExpressionToAggregationExpressionTranslator.Translate(resultSelectorContext, resultSelectorLambda.Body);
136+
var resultSelectorTargetSerializer = GetResultSelectorTargetSerializer(method, targetSerializer);
137+
var resultSelectorTranslation = ExpressionToAggregationExpressionTranslator.Translate(resultSelectorContext, resultSelectorLambda.Body, resultSelectorTargetSerializer);
126138

127139
ast = AstExpression.Let(
128140
var: AstExpression.VarBinding(resultSelectorAccumulatorSymbol.Var, ast),
@@ -136,5 +148,57 @@ public static AggregationExpression Translate(TranslationContext context, Method
136148

137149
throw new ExpressionNotSupportedException(expression);
138150
}
151+
152+
private static IBsonSerializer GetFuncTargetSerializer(MethodInfo method, IBsonSerializer targetSerializer)
153+
{
154+
if (method.IsOneOf(__aggregateWithFuncMethods, __aggregateWithSeedAndFuncMethods))
155+
{
156+
return targetSerializer;
157+
}
158+
159+
return null;
160+
}
161+
162+
private static IBsonSerializer GetResultSelectorTargetSerializer(MethodInfo method, IBsonSerializer targetSerializer)
163+
{
164+
if (method.IsOneOf(__aggregateWithSeedAndFuncAndResultSelectorMethods))
165+
{
166+
return targetSerializer;
167+
}
168+
169+
return null;
170+
}
171+
172+
private static IBsonSerializer GetSeedTargetSerializer(MethodInfo method, IBsonSerializer targetSerializer)
173+
{
174+
if (method.IsOneOf(__aggregateWithSeedAndFuncMethods))
175+
{
176+
return targetSerializer;
177+
}
178+
179+
return null;
180+
}
181+
182+
private static IBsonSerializer GetSourceTargetSerializer(MethodInfo method, IBsonSerializer targetSerializer)
183+
{
184+
IBsonSerializer itemSerializer = null;
185+
if (method.IsOneOf(__aggregateWithFuncMethods))
186+
{
187+
itemSerializer = targetSerializer;
188+
}
189+
190+
if (method.IsOneOf(__aggregateWithSeedAndFuncMethods))
191+
{
192+
var genericArguments = method.GetGenericArguments();
193+
var sourceType = genericArguments[0];
194+
var accumulateType = genericArguments[1];
195+
if (sourceType == accumulateType)
196+
{
197+
itemSerializer = targetSerializer;
198+
}
199+
}
200+
201+
return itemSerializer == null ? null : IEnumerableSerializer.Create(itemSerializer);
202+
}
139203
}
140204
}

‎tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Jira/CSharp5435Tests.cs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -75,26 +75,26 @@ public void Test_set_ValueObject_Value_using_property_setter()
7575
coll.UpdateOne(filter, updateError, new() { IsUpsert = true });
7676
}
7777

78-
[Fact]
79-
public void Test_set_ValueObject_to_derived_value_using_property_setter()
80-
{
81-
var coll = GetCollection();
82-
var doc = new MyDocument();
83-
var filter = Builders<MyDocument>.Filter.Eq(x => x.Id, doc.Id);
84-
85-
var pipelineError = new EmptyPipelineDefinition<MyDocument>()
86-
.Set(x => new MyDocument()
87-
{
88-
ValueObject = new MyDerivedValue()
89-
{
90-
Value = x.ValueObject == null ? 1 : x.ValueObject.Value + 1,
91-
B = 42
92-
}
93-
});
94-
var updateError = Builders<MyDocument>.Update.Pipeline(pipelineError);
95-
96-
coll.UpdateOne(filter, updateError, new() { IsUpsert = true });
97-
}
78+
// [Fact]
79+
// public void Test_set_ValueObject_to_derived_value_using_property_setter()
80+
// {
81+
// var coll = GetCollection();
82+
// var doc = new MyDocument();
83+
// var filter = Builders<MyDocument>.Filter.Eq(x => x.Id, doc.Id);
84+
//
85+
// var pipelineError = new EmptyPipelineDefinition<MyDocument>()
86+
// .Set(x => new MyDocument()
87+
// {
88+
// ValueObject = new MyDerivedValue()
89+
// {
90+
// Value = x.ValueObject == null ? 1 : x.ValueObject.Value + 1,
91+
// B = 42
92+
// }
93+
// });
94+
// var updateError = Builders<MyDocument>.Update.Pipeline(pipelineError);
95+
//
96+
// coll.UpdateOne(filter, updateError, new() { IsUpsert = true });
97+
// }
9898

9999
[Fact]
100100
public void Test_set_X_using_constructor()

0 commit comments

Comments
 (0)