Initial commit (#3826)

Azure · May 3, 2023 · 9ba3f75 · 9ba3f75
1 parent 1dcba53
commit 9ba3f75
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 3 deletions.
diff --git a/Microsoft.Azure.Cosmos/src/Linq/TranslationContext.cs b/Microsoft.Azure.Cosmos/src/Linq/TranslationContext.cs
@@ -119,6 +119,7 @@ public void PopParameter()
         {
             ParameterExpression last = this.lambdaParametersStack[this.lambdaParametersStack.Count - 1];
             this.lambdaParametersStack.RemoveAt(this.lambdaParametersStack.Count - 1);
+            this.substitutions.Remove(last);
         }
 
         /// <summary>
@@ -337,6 +338,11 @@ public Expression Lookup(ParameterExpression parameter)
             return null;
         }
 
+        internal void Remove(ParameterExpression parameter)
+        {
+            this.substitutionTable.Remove(parameter);
+        }
+
         public const string InputParameterName = "root";
     }
 

diff --git a/...oft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/BaselineTests.cs b/...oft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/BaselineTests.cs
@@ -153,8 +153,8 @@ public void ExecuteTestSuite(IEnumerable<TInput> inputs, [CallerMemberName] stri
                     Please run the ..\azure-cosmos-dotnet-v3\UpdateContracts.ps1 script to update the baselines.
                     Expected: {baselineTextSuffix},
                     Actual:   {outputTextSuffix},
-                    OutputPath: {outputPath},
-                    BaselinePath: {baselinePath}");
+                    OutputPath: {Path.GetFullPath(outputPath)},
+                    BaselinePath: {Path.GetFullPath(baselinePath)}");
         }
 
         /// <summary>

diff --git a/...smos.EmulatorTests/BaselineTest/TestBaseline/LinqGeneralBaselineTests.TestLambdaReuse.xml b/...smos.EmulatorTests/BaselineTest/TestBaseline/LinqGeneralBaselineTests.TestLambdaReuse.xml
@@ -0,0 +1,38 @@
+<Results>
+  <Result>
+    <Input>
+      <Description><![CDATA[Where -> Where with same predicate instance]]></Description>
+      <Expression><![CDATA[query.Where(DisplayClass.predicate).Where(DisplayClass.predicate)]]></Expression>
+    </Input>
+    <Output>
+      <SqlQuery><![CDATA[
+SELECT VALUE root 
+FROM root 
+WHERE ((root["Int"] = 5) AND (root["Int"] = 5))]]></SqlQuery>
+    </Output>
+  </Result>
+  <Result>
+    <Input>
+      <Description><![CDATA[Where -> Select with same predicate instance]]></Description>
+      <Expression><![CDATA[query.Where(DisplayClass.predicate).Select(DisplayClass.predicate)]]></Expression>
+    </Input>
+    <Output>
+      <SqlQuery><![CDATA[
+SELECT VALUE (root["Int"] = 5) 
+FROM root 
+WHERE (root["Int"] = 5)]]></SqlQuery>
+    </Output>
+  </Result>
+  <Result>
+    <Input>
+      <Description><![CDATA[Where -> Select -> Where with same predicate instance]]></Description>
+      <Expression><![CDATA[query.Where(DisplayClass.predicate2).Select(c => new AnonymousType(Int = 10, Result = c)).Where(DisplayClass.predicate2)]]></Expression>
+    </Input>
+    <Output>
+      <SqlQuery><![CDATA[
+SELECT VALUE {"Int": 10, "Result": root} 
+FROM root 
+WHERE ((ToString(root) = "a") AND (ToString({"Int": 10, "Result": root}) = "a"))]]></SqlQuery>
+    </Output>
+  </Result>
+</Results>
diff --git a/...osoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/LinqGeneralBaselineTests.cs b/...osoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/LinqGeneralBaselineTests.cs
@@ -1272,6 +1272,25 @@ orderby f.FamilyId descending
             this.ExecuteTestSuite(inputs);
         }
 
+        [TestMethod]
+        public void TestLambdaReuse()
+        {
+            List<LinqTestInput> inputs = new List<LinqTestInput>();
+
+            System.Linq.Expressions.Expression<Func<Family, bool>> predicate = f => f.Int == 5;
+            inputs.Add(new LinqTestInput("Where -> Where with same predicate instance", b => getQuery(b).Where(predicate).Where(predicate)));
+            inputs.Add(new LinqTestInput("Where -> Select with same predicate instance", b => getQuery(b).Where(predicate).Select(predicate)));
+
+            System.Linq.Expressions.Expression<Func<object, bool>> predicate2 = f => f.ToString() == "a";
+            inputs.Add(new LinqTestInput("Where -> Select -> Where with same predicate instance",
+                b => getQuery(b)
+                    .Where(predicate2)
+                    .Select(c => new { Int = 10, Result = c })
+                    .Where(predicate2)));
+
+            this.ExecuteTestSuite(inputs);
+        }
+
         [TestMethod]
         public void TestThenByTranslation()
         {
@@ -1922,7 +1941,7 @@ public async Task ValidateLinqQueries()
                 Gender = "female",
                 Grade = 1,
                 Pets = new List<Pet>() { pet, new Pet() { GivenName = "koko" } },
-                Things = new Dictionary<string, string>() { { "A", "B" }, { "C", "D" } },
+                Things = new Dictionary<string, string>() { { "A", "B" }, { "C", "D" } }
             };
 
             Address address = new Address { State = "NY", County = "Manhattan", City = "NY" };

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
@@ -35,6 +35,7 @@
     <None Remove="BaselineTest\TestBaseline\EndToEndTraceWriterBaselineTests.StreamPointOperationsAsync.xml" />
     <None Remove="BaselineTest\TestBaseline\EndToEndTraceWriterBaselineTests.TypedPointOperationsAsync.xml" />
 	<None Remove="BaselineTest\TestBaseline\IndexMetricsParserBaselineTest.IndexUtilizationParse.xml" />
+	<None Remove="BaselineTest\TestBaseline\LinqGeneralBaselineTests.TestLambdaReuse.xml" />
     <None Remove="BaselineTest\TestBaseline\LinqTranslationBaselineTests.TestDateTimeJsonConverterTimezones.xml" />
     <None Remove="BaselineTest\TestBaseline\LinqTranslationBaselineTests.TestMemberAccessWithNullableTypes.xml" />
   </ItemGroup>
@@ -283,6 +284,11 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.Azure.Cosmos.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="BaselineTest\TestBaseline\LinqGeneralBaselineTests.TestLambdaReuse.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <ItemGroup>
     <Compile Update="Tracing\EndToEndTraceWriterBaselineTests.cs">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>