Code changes to address review comments.

Azure · Apr 15, 2024 · 683ca13 · 683ca13
1 parent 73178e0
commit 683ca13
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/...ine/LinqAggregateCustomSerializationBaseline.TestAggregateQueriesWithCustomSerializer.xml b/...ine/LinqAggregateCustomSerializationBaseline.TestAggregateQueriesWithCustomSerializer.xml
@@ -130,7 +130,7 @@ FROM root]]></SqlQuery>
     </Input>
     <Output>
       <SqlQuery><![CDATA[
-SELECT VALUE AVG(root["NumericField"]) 
+SELECT VALUE AVG(root["NumberValueDotNet"]) 
 FROM root]]></SqlQuery>
     </Output>
   </Result>
@@ -141,7 +141,7 @@ FROM root]]></SqlQuery>
     </Input>
     <Output>
       <SqlQuery><![CDATA[
-SELECT VALUE SUM(root["NumericField"]) 
+SELECT VALUE SUM(root["NumberValueDotNet"]) 
 FROM root]]></SqlQuery>
     </Output>
   </Result>
@@ -154,7 +154,7 @@ FROM root]]></SqlQuery>
       <SqlQuery><![CDATA[
 SELECT VALUE AVG(m0) 
 FROM root 
-JOIN m0 IN root["ArrayField"] 
+JOIN m0 IN root["ArrayValuesDotNet"] 
 WHERE ((m0 % 3) = 0)]]></SqlQuery>
     </Output>
   </Result>
@@ -167,11 +167,11 @@ WHERE ((m0 % 3) = 0)]]></SqlQuery>
       <SqlQuery><![CDATA[
 SELECT VALUE COUNT(1) 
 FROM (
-    SELECT VALUE root["NumericField"] 
+    SELECT VALUE root["NumberValueDotNet"] 
     FROM root 
     OFFSET 2 LIMIT 2147483647) AS r0
 ]]></SqlQuery>
-      <ErrorMessage><![CDATA[Status Code: BadRequest,{"errors":[{"severity":"Error","location":{"start":72,"end":97},"code":"SC2204","message":"'OFFSET LIMIT' clause is not supported in subqueries."}]},0x800A0B00]]></ErrorMessage>
+      <ErrorMessage><![CDATA[Status Code: BadRequest,{"errors":[{"severity":"Error","location":{"start":77,"end":102},"code":"SC2204","message":"'OFFSET LIMIT' clause is not supported in subqueries."}]},0x800A0B00]]></ErrorMessage>
     </Output>
   </Result>
   <Result>
@@ -181,7 +181,7 @@ FROM (
     </Input>
     <Output>
       <SqlQuery><![CDATA[
-SELECT VALUE MIN(root["NumericField"]) 
+SELECT VALUE MIN(root["NumberValueDotNet"]) 
 FROM root]]></SqlQuery>
     </Output>
   </Result>

diff --git a/...sts/Microsoft.Azure.Cosmos.EmulatorTests/Linq/LinqAggregateCustomSerializationBaseline.cs b/...sts/Microsoft.Azure.Cosmos.EmulatorTests/Linq/LinqAggregateCustomSerializationBaseline.cs
@@ -29,10 +29,10 @@ public class LinqAggregateCustomSerializationBaseline : BaselineTests<LinqAggreg
         private static Cosmos.Database testDb;
         private static Container testContainer;
 
-        private static CosmosSerializer defaultCosmosSerializer;
-        private static CosmosClient defaultClient;
-        private static Cosmos.Database testDbDefault;
-        private static Container testContainerDefault;
+        private static CosmosSerializer stjCosmosSerializer;
+        private static CosmosClient stjClient;
+        private static Cosmos.Database testDbSTJ;
+        private static Container testContainerSTJ;
 
         [ClassInitialize]
         public async static Task Initialize(TestContext textContext)
@@ -64,19 +64,19 @@ public async static Task Initialize(TestContext textContext)
             testDb = await client.CreateDatabaseAsync(dbName);
             testContainer = testDb.CreateContainerAsync(new ContainerProperties(id: Guid.NewGuid().ToString(), partitionKeyPath: "/Pk")).Result;
 
-            defaultCosmosSerializer = new CosmosSystemTextJsonSerializer(new JsonSerializerOptions());
+            stjCosmosSerializer = new CosmosSystemTextJsonSerializer(new JsonSerializerOptions());
 
-            defaultClient = TestCommon.CreateCosmosClient((cosmosClientBuilder)
-                => cosmosClientBuilder.WithCustomSerializer(customCosmosSerializer));
+            stjClient = TestCommon.CreateCosmosClient((cosmosClientBuilder)
+                => cosmosClientBuilder.WithCustomSerializer(stjCosmosSerializer));
 
             // Set a callback to get the handle of the last executed query to do the verification
             // This is neede because aggregate queries return type is a scalar so it can't be used 
             // to verify the translated LINQ directly as other queries type.
-            defaultClient.DocumentClient.OnExecuteScalarQueryCallback = q => lastExecutedScalarQuery = q;
+            stjClient.DocumentClient.OnExecuteScalarQueryCallback = q => lastExecutedScalarQuery = q;
 
             dbName = $"{nameof(LinqAggregateCustomSerializationBaseline)}-{Guid.NewGuid():N}";
-            testDbDefault = await defaultClient.CreateDatabaseAsync(dbName);
-            testContainerDefault = testDbDefault.CreateContainerAsync(new ContainerProperties(id: Guid.NewGuid().ToString(), partitionKeyPath: "/Pk")).Result;
+            testDbSTJ = await stjClient.CreateDatabaseAsync(dbName);
+            testContainerSTJ = testDbSTJ.CreateContainerAsync(new ContainerProperties(id: Guid.NewGuid().ToString(), partitionKeyPath: "/Pk")).Result;
         }
 
         [ClassCleanup]
@@ -118,7 +118,7 @@ static DataObjectDotNet createDataObj(int index, bool camelCase)
             {
                 LinqTestsCommon.GenerateSerializationTestCosmosData<DataObjectDotNet>(createDataObj, 5, testContainerLinq, new CosmosLinqSerializerOptions()),
                 LinqTestsCommon.GenerateSerializationTestCosmosData<DataObjectDotNet>(createDataObj, 5, testContainer, new CosmosLinqSerializerOptions()),
-                LinqTestsCommon.GenerateSerializationTestCosmosData<DataObjectDotNet>(createDataObj, 5, testContainerDefault, new CosmosLinqSerializerOptions())
+                LinqTestsCommon.GenerateSerializationTestCosmosData<DataObjectDotNet>(createDataObj, 5, testContainerSTJ, new CosmosLinqSerializerOptions())
             };
 
             Dictionary<string, int> serializerIndexes = new()