Query: Fixes regression from LINQ custom serializer fix (#3749)

Co-authored-by: Minh Le <leminh@microsoft.com> Co-authored-by: Matias Quaranta <ealsur@users.noreply.github.com>
Azure · Mar 10, 2023 · 682b001 · 682b001
1 parent 6ebb8d4
commit 682b001
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 245 deletions.
diff --git a/Microsoft.Azure.Cosmos/src/Linq/ExpressionToSQL.cs b/Microsoft.Azure.Cosmos/src/Linq/ExpressionToSQL.cs
@@ -10,7 +10,6 @@ namespace Microsoft.Azure.Cosmos.Linq
     using System.Collections.ObjectModel;
     using System.Diagnostics;
     using System.Globalization;
-    using System.IO;
     using System.Linq;
     using System.Linq.Expressions;
     using System.Reflection;
@@ -713,22 +712,6 @@ public static SqlScalarExpression VisitConstant(ConstantExpression inputExpressi
                 return SqlArrayCreateScalarExpression.Create(arrayItems.ToImmutableArray());
             }
 
-            if (context.linqSerializerOptions?.CustomCosmosSerializer != null)
-            {
-                StringWriter writer = new StringWriter(CultureInfo.InvariantCulture);
-
-                // Use the user serializer for the parameter values so custom conversions are correctly handled
-                using (Stream stream = context.linqSerializerOptions.CustomCosmosSerializer.ToStream(inputExpression.Value))
-                {
-                    using (StreamReader streamReader = new StreamReader(stream))
-                    {
-                        string propertyValue = streamReader.ReadToEnd();
-                        writer.Write(propertyValue);
-                        return CosmosElement.Parse(writer.ToString()).Accept(CosmosElementToSqlScalarExpressionVisitor.Singleton);
-                    }
-                }
-            }
-
             return CosmosElement.Parse(JsonConvert.SerializeObject(inputExpression.Value)).Accept(CosmosElementToSqlScalarExpressionVisitor.Singleton);
         }
 

diff --git a/Microsoft.Azure.Cosmos/src/Resource/Container/ContainerCore.Items.cs b/Microsoft.Azure.Cosmos/src/Resource/Container/ContainerCore.Items.cs
@@ -505,14 +505,11 @@ public override IOrderedQueryable<T> GetItemLinqQueryable<T>(
         {
             requestOptions ??= new QueryRequestOptions();
 
-            if (linqSerializerOptions == null && this.ClientContext.ClientOptions != null)
+            if (linqSerializerOptions == null && this.ClientContext.ClientOptions.SerializerOptions != null)
             {
                 linqSerializerOptions = new CosmosLinqSerializerOptions
                 {
-                    PropertyNamingPolicy = this.ClientContext.ClientOptions.SerializerOptions != null 
-                                            ? this.ClientContext.ClientOptions.SerializerOptions.PropertyNamingPolicy
-                                            : CosmosPropertyNamingPolicy.Default,
-                    CustomCosmosSerializer = this.ClientContext.ClientOptions.Serializer
+                    PropertyNamingPolicy = this.ClientContext.ClientOptions.SerializerOptions.PropertyNamingPolicy
                 };
             }
 

diff --git a/Microsoft.Azure.Cosmos/src/Serializer/CosmosLinqSerializerOptions.cs b/Microsoft.Azure.Cosmos/src/Serializer/CosmosLinqSerializerOptions.cs
@@ -22,15 +22,6 @@ public CosmosLinqSerializerOptions()
             this.PropertyNamingPolicy = CosmosPropertyNamingPolicy.Default;
         }
 
-        /// <summary>
-        /// Gets or sets the user defined customer serializer. If no customer serializer was defined, 
-        /// then the value is set to the default value
-        /// </summary>
-        /// <remarks>
-        /// The default value is null
-        /// </remarks>
-        internal CosmosSerializer CustomCosmosSerializer { get; set; }
-
         /// <summary>
         /// Gets or sets whether the naming policy used to convert a string-based name to another format,
         /// such as a camel-casing format.

diff --git a/...Tests/BaselineTest/TestBaseline/LinqTranslationBaselineTests.TestLiteralSerialization.xml b/...Tests/BaselineTest/TestBaseline/LinqTranslationBaselineTests.TestLiteralSerialization.xml
@@ -435,7 +435,7 @@ FROM root]]></SqlQuery>
     </Input>
     <Output>
       <SqlQuery><![CDATA[
-SELECT VALUE {} 
+SELECT VALUE {"value": null} 
 FROM root]]></SqlQuery>
     </Output>
   </Result>

diff --git a/...neTest/TestBaseline/LinqTranslationWithCustomSerializerBaseline.TestMemberInitializer.xml b/...neTest/TestBaseline/LinqTranslationWithCustomSerializerBaseline.TestMemberInitializer.xml
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/LinqTestsCommon.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/LinqTestsCommon.cs
@@ -455,7 +455,9 @@ Family createDataObj(Random random)
             return getQuery;
         }
 
-        public static Func<bool, IQueryable<Data>> GenerateSimpleCosmosData(Cosmos.Database cosmosDatabase)
+        public static Func<bool, IQueryable<Data>> GenerateSimpleCosmosData(
+         Cosmos.Database cosmosDatabase
+         )
         {
             const int DocumentCount = 10;
             PartitionKeyDefinition partitionKeyDefinition = new PartitionKeyDefinition { Paths = new System.Collections.ObjectModel.Collection<string>(new[] { "/Pk" }), Kind = PartitionKind.Hash };

diff --git a/...t.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/LinqTranslationBaselineTests.cs b/...t.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/LinqTranslationBaselineTests.cs
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------
-// <copyright file="LinqTranslationBaselineTests.cs" company="Microsoft Corporation">
+// <copyright file="LinqAttributeContractTests.cs" company="Microsoft Corporation">
 //     Copyright (c) Microsoft Corporation.  All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------

diff --git a/...tests/Microsoft.Azure.Cosmos.EmulatorTests/LinqTranslationWithCustomSerializerBaseline.cs b/...tests/Microsoft.Azure.Cosmos.EmulatorTests/LinqTranslationWithCustomSerializerBaseline.cs
diff --git a/...os/tests/Microsoft.Azure.Cosmos.EmulatorTests/Microsoft.Azure.Cosmos.EmulatorTests.csproj b/...os/tests/Microsoft.Azure.Cosmos.EmulatorTests/Microsoft.Azure.Cosmos.EmulatorTests.csproj
@@ -37,7 +37,6 @@
 	<None Remove="BaselineTest\TestBaseline\IndexMetricsParserBaselineTest.IndexUtilizationParse.xml" />
     <None Remove="BaselineTest\TestBaseline\LinqTranslationBaselineTests.TestDateTimeJsonConverterTimezones.xml" />
     <None Remove="BaselineTest\TestBaseline\LinqTranslationBaselineTests.TestMemberAccessWithNullableTypes.xml" />
-	<None Remove="BaselineTest\TestBaseline\LinqTranslationWithCustomSerializerBaseline.TestMemberInitializer.xml" />
   </ItemGroup>
 
   <ItemGroup>
@@ -248,9 +247,6 @@
     <Content Include="BaselineTest\TestBaseline\LinqTranslationBaselineTests.TestMemberAccess.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-	<Content Include="BaselineTest\TestBaseline\LinqTranslationWithCustomSerializerBaseline.TestMemberInitializer.xml">
-		<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	</Content>
     <Content Include="Query\AggregateQueryTests.AggregateMixedTypes_baseline.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>