Skip to content

Commit 1e49dab

Browse files
committed
CSHARP-5474: Move newOutputSerializer parameter to AddStages to the end of the parameter list.
1 parent 31de7c9 commit 1e49dab

File tree

34 files changed

+136
-101
lines changed

34 files changed

+136
-101
lines changed

src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToExecutableQueryTranslators/AllMethodToExecutableQueryTranslator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ public static ExecutableQuery<TDocument, bool> Translate<TDocument>(MongoQueryPr
5353
var predicateFilter = ExpressionToFilterTranslator.TranslateLambda(context, predicateLambda, parameterSerializer: pipeline.OutputSerializer, asRoot: true);
5454

5555
pipeline = pipeline.AddStages(
56-
__outputSerializer,
5756
AstStage.Match(AstFilter.Not(predicateFilter)),
5857
AstStage.Limit(1),
5958
AstStage.Project(
6059
AstProject.ExcludeId(),
61-
AstProject.Set("_v", BsonNull.Value)));
60+
AstProject.Set("_v", BsonNull.Value)),
61+
__outputSerializer);
6262

6363
return ExecutableQuery.Create(
6464
provider,

src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToExecutableQueryTranslators/AnyMethodToExecutableQueryTranslator.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,17 @@ public static ExecutableQuery<TDocument, bool> Translate<TDocument>(MongoQueryPr
7575
var predicateLambda = ExpressionHelper.UnquoteLambda(arguments[1]);
7676
var predicateFilter = ExpressionToFilterTranslator.TranslateLambda(context, predicateLambda, parameterSerializer: pipeline.OutputSerializer, asRoot: true);
7777

78-
pipeline = pipeline.AddStages(
79-
pipeline.OutputSerializer,
80-
AstStage.Match(predicateFilter));
78+
pipeline = pipeline.AddStage(
79+
AstStage.Match(predicateFilter),
80+
pipeline.OutputSerializer);
8181
}
8282

8383
pipeline = pipeline.AddStages(
84-
__outputSerializer,
8584
AstStage.Limit(1),
8685
AstStage.Project(
8786
AstProject.ExcludeId(),
88-
AstProject.Set("_v", BsonNull.Value)));
87+
AstProject.Set("_v", BsonNull.Value)),
88+
__outputSerializer);
8989

9090
return ExecutableQuery.Create(
9191
provider,

src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToExecutableQueryTranslators/AverageMethodToExecutableQueryTranslator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,11 @@ public static ExecutableQuery<TDocument, TOutput> Translate<TDocument>(MongoQuer
149149
var outputWrappedValueSerializer = WrappedValueSerializer.Create("_v", outputValueSerializer);
150150

151151
pipeline = pipeline.AddStages(
152-
outputWrappedValueSerializer,
153152
AstStage.Group(
154153
id: BsonNull.Value,
155154
fields: AstExpression.AccumulatorField("_v", AstUnaryAccumulatorOperator.Avg, valueExpression)),
156-
AstStage.Project(AstProject.ExcludeId()));
155+
AstStage.Project(AstProject.ExcludeId()),
156+
outputWrappedValueSerializer);
157157

158158
return ExecutableQuery.Create(
159159
provider,

src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToExecutableQueryTranslators/ContainsMethodToExecutableQueryTranslator.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ public static ExecutableQuery<TDocument, bool> Translate<TDocument>(MongoQueryPr
5959
{
6060
valueSerializer = pipeline.OutputSerializer;
6161
wrappedValueSerializer = WrappedValueSerializer.Create("_v", valueSerializer);
62-
pipeline = pipeline.AddStages(
63-
wrappedValueSerializer,
62+
pipeline = pipeline.AddStage(
6463
AstStage.Project(
6564
AstProject.ExcludeId(),
66-
AstProject.Set("_v", AstExpression.RootVar)));
65+
AstProject.Set("_v", AstExpression.RootVar)),
66+
wrappedValueSerializer);
6767
}
6868

6969
var itemExpression = arguments[1];
@@ -72,12 +72,12 @@ public static ExecutableQuery<TDocument, bool> Translate<TDocument>(MongoQueryPr
7272

7373
AstFilter filter = AstFilter.Eq(AstFilter.Field("_v"), serializedValue);
7474
pipeline = pipeline.AddStages(
75-
__outputSerializer,
7675
AstStage.Match(filter),
7776
AstStage.Limit(1),
7877
AstStage.Project(
7978
AstProject.ExcludeId(),
80-
AstProject.Set("_v", BsonNull.Value)));
79+
AstProject.Set("_v", BsonNull.Value)),
80+
__outputSerializer);
8181

8282
return ExecutableQuery.Create(
8383
provider,

src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToExecutableQueryTranslators/CountMethodToExecutableQueryTranslator.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ public static ExecutableQuery<TDocument, int> Translate<TDocument>(MongoQueryPro
7171
var predicateLambda = ExpressionHelper.UnquoteLambda(arguments[1]);
7272
var predicateFilter = ExpressionToFilterTranslator.TranslateLambda(context, predicateLambda, parameterSerializer: pipeline.OutputSerializer, asRoot: true);
7373

74-
pipeline = pipeline.AddStages(
75-
pipeline.OutputSerializer,
76-
AstStage.Match(predicateFilter));
74+
pipeline = pipeline.AddStage(
75+
AstStage.Match(predicateFilter),
76+
pipeline.OutputSerializer);
7777
}
7878

79-
pipeline = pipeline.AddStages(
80-
__wrappedInt32Serializer,
81-
AstStage.Count("_v"));
79+
pipeline = pipeline.AddStage(
80+
AstStage.Count("_v"),
81+
__wrappedInt32Serializer);
8282

8383
return ExecutableQuery.Create(
8484
provider,

src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToExecutableQueryTranslators/ElementAtMethodToExecutableQueryTranslator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ public static ExecutableQuery<TDocument, TOutput> Translate<TDocument>(MongoQuer
4343
var indexValue = indexExpression.GetConstantValue<int>(containingExpression: expression);
4444

4545
pipeline = pipeline.AddStages(
46-
pipeline.OutputSerializer,
4746
AstStage.Skip(indexValue),
48-
AstStage.Limit(1));
47+
AstStage.Limit(1),
48+
pipeline.OutputSerializer);
4949

5050
return ExecutableQuery.Create(
5151
provider,

src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToExecutableQueryTranslators/FirstMethodToExecutableQueryTranslator.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ public static ExecutableQuery<TDocument, TOutput> Translate<TDocument>(MongoQuer
7474
var predicateLambda = ExpressionHelper.UnquoteLambda(arguments[1]);
7575
var predicateFilter = ExpressionToFilterTranslator.TranslateLambda(context, predicateLambda, parameterSerializer: pipeline.OutputSerializer, asRoot: true);
7676

77-
pipeline = pipeline.AddStages(
78-
pipeline.OutputSerializer,
79-
AstStage.Match(predicateFilter));
77+
pipeline = pipeline.AddStage(
78+
AstStage.Match(predicateFilter),
79+
pipeline.OutputSerializer);
8080
}
8181

82-
pipeline = pipeline.AddStages(
83-
pipeline.OutputSerializer,
84-
AstStage.Limit(1));
82+
pipeline = pipeline.AddStage(
83+
AstStage.Limit(1),
84+
pipeline.OutputSerializer);
8585

8686
var finalizer = method.Name == "FirstOrDefault" ? __firstOrDefaultFinalizer : __firstFinalizer;
8787

src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToExecutableQueryTranslators/LastMethodToExecutableQueryTranslator.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,16 @@ public static ExecutableQuery<TDocument, TOutput> Translate<TDocument>(MongoQuer
7070
var predicateLambda = ExpressionHelper.UnquoteLambda(arguments[1]);
7171
var predicateFilter = ExpressionToFilterTranslator.TranslateLambda(context, predicateLambda, parameterSerializer: pipeline.OutputSerializer, asRoot: true);
7272

73-
pipeline = pipeline.AddStages(
74-
pipeline.OutputSerializer,
75-
AstStage.Match(predicateFilter));
73+
pipeline = pipeline.AddStage(
74+
AstStage.Match(predicateFilter),
75+
pipeline.OutputSerializer);
7676
}
7777

78-
pipeline = pipeline.AddStages(
79-
pipeline.OutputSerializer,
78+
pipeline = pipeline.AddStage(
8079
AstStage.Group(
8180
id: BsonNull.Value,
82-
fields: AstExpression.AccumulatorField("_last", AstUnaryAccumulatorOperator.Last, AstExpression.RootVar)));
81+
fields: AstExpression.AccumulatorField("_last", AstUnaryAccumulatorOperator.Last, AstExpression.RootVar)),
82+
pipeline.OutputSerializer);
8383

8484
var finalizer = method.Name == "LastOrDefault" ? __singleOrDefaultFinalizer : __singleFinalizer;
8585

src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToExecutableQueryTranslators/LongCountMethodToExecutableQueryTranslator.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,14 @@ public static ExecutableQuery<TDocument, long> Translate<TDocument>(MongoQueryPr
6969
var predicateLambda = ExpressionHelper.UnquoteLambda(arguments[1]);
7070
var predicateFilter = ExpressionToFilterTranslator.TranslateLambda(context, predicateLambda, parameterSerializer: pipeline.OutputSerializer, asRoot: true);
7171

72-
pipeline = pipeline.AddStages(
73-
pipeline.OutputSerializer,
74-
AstStage.Match(predicateFilter));
72+
pipeline = pipeline.AddStage(
73+
AstStage.Match(predicateFilter),
74+
pipeline.OutputSerializer);
7575
}
7676

77-
pipeline = pipeline.AddStages(
78-
__wrappedInt64Serializer,
79-
AstStage.Count("_v"));
77+
pipeline = pipeline.AddStage(
78+
AstStage.Count("_v"),
79+
__wrappedInt64Serializer);
8080

8181
return ExecutableQuery.Create(
8282
provider,

src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToExecutableQueryTranslators/MaxMethodToExecutableQueryTranslator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ public static ExecutableQuery<TDocument, TOutput> Translate<TDocument>(MongoQuer
9090
}
9191

9292
pipeline = pipeline.AddStages(
93-
valueSerializer,
9493
AstStage.Group(
9594
id: BsonNull.Value,
9695
fields: AstExpression.AccumulatorField("_max", AstUnaryAccumulatorOperator.Max, valueAst)),
97-
AstStage.ReplaceRoot(AstExpression.GetField(AstExpression.RootVar, "_max")));
96+
AstStage.ReplaceRoot(AstExpression.GetField(AstExpression.RootVar, "_max")),
97+
valueSerializer);
9898

9999
return ExecutableQuery.Create(
100100
provider,

0 commit comments

Comments
 (0)