VCST-1752: Fix performance degradation on SQL Server (#212)

VirtoCommerce · Sep 13, 2024 · f1fc7fd · f1fc7fd
1 parent 62cfe31
commit f1fc7fd
Show file tree

Hide file tree

Showing 16 changed files with 36 additions and 60 deletions.
diff --git a/src/VirtoCommerce.PricingModule.Core/VirtoCommerce.PricingModule.Core.csproj b/src/VirtoCommerce.PricingModule.Core/VirtoCommerce.PricingModule.Core.csproj
@@ -17,6 +17,6 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="VirtoCommerce.CatalogModule.Core" Version="3.800.0" />
     <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.800.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.825.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.851.0" />
   </ItemGroup>
 </Project>
diff --git a/src/VirtoCommerce.PricingModule.Data.MySql/DbContextOptionsBuilderExtensions.cs b/src/VirtoCommerce.PricingModule.Data.MySql/DbContextOptionsBuilderExtensions.cs
diff --git a/src/VirtoCommerce.PricingModule.Data.MySql/MySqlDataAssemblyMarker.cs b/src/VirtoCommerce.PricingModule.Data.MySql/MySqlDataAssemblyMarker.cs
@@ -0,0 +1,5 @@
+namespace VirtoCommerce.PricingModule.Data.MySql;
+
+public class MySqlDataAssemblyMarker
+{
+}
diff --git a/src/VirtoCommerce.PricingModule.Data.MySql/MySqlDbContextFactory.cs b/src/VirtoCommerce.PricingModule.Data.MySql/MySqlDbContextFactory.cs
@@ -16,7 +16,7 @@ public PricingDbContext CreateDbContext(string[] args)
                 connectionString,
                 ResolveServerVersion(serverVersion, connectionString),
                 db => db
-                    .MigrationsAssembly(typeof(MySqlDbContextFactory).Assembly.GetName().Name));
+                    .MigrationsAssembly(typeof(MySqlDataAssemblyMarker).Assembly.GetName().Name));
 
             return new PricingDbContext(builder.Options);
         }

diff --git a/src/VirtoCommerce.PricingModule.Data.MySql/VirtoCommerce.PricingModule.Data.MySql.csproj b/src/VirtoCommerce.PricingModule.Data.MySql/VirtoCommerce.PricingModule.Data.MySql.csproj
@@ -5,11 +5,11 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="VirtoCommerce.Platform.Data.MySql" Version="3.825.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data.MySql" Version="3.851.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.PricingModule.Data\VirtoCommerce.PricingModule.Data.csproj" />

diff --git a/src/VirtoCommerce.PricingModule.Data.PostgreSql/DbContextOptionsBuilderExtensions.cs b/src/VirtoCommerce.PricingModule.Data.PostgreSql/DbContextOptionsBuilderExtensions.cs
diff --git a/src/VirtoCommerce.PricingModule.Data.PostgreSql/PostgreSqlDataAssemblyMarker.cs b/src/VirtoCommerce.PricingModule.Data.PostgreSql/PostgreSqlDataAssemblyMarker.cs
@@ -0,0 +1,5 @@
+namespace VirtoCommerce.PricingModule.Data.PostgreSql;
+
+public class PostgreSqlDataAssemblyMarker
+{
+}
diff --git a/src/VirtoCommerce.PricingModule.Data.PostgreSql/PostgreSqlDbContextFactory.cs b/src/VirtoCommerce.PricingModule.Data.PostgreSql/PostgreSqlDbContextFactory.cs
@@ -13,7 +13,7 @@ public PricingDbContext CreateDbContext(string[] args)
 
             builder.UseNpgsql(
                 connectionString,
-                db => db.MigrationsAssembly(typeof(PostgreSqlDbContextFactory).Assembly.GetName().Name));
+                db => db.MigrationsAssembly(typeof(PostgreSqlDataAssemblyMarker).Assembly.GetName().Name));
 
             return new PricingDbContext(builder.Options);
         }

diff --git a/...Commerce.PricingModule.Data.PostgreSql/VirtoCommerce.PricingModule.Data.PostgreSql.csproj b/...Commerce.PricingModule.Data.PostgreSql/VirtoCommerce.PricingModule.Data.PostgreSql.csproj
@@ -5,11 +5,11 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="VirtoCommerce.Platform.Data.PostgreSql" Version="3.825.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data.PostgreSql" Version="3.851.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.PricingModule.Data\VirtoCommerce.PricingModule.Data.csproj" />

diff --git a/src/VirtoCommerce.PricingModule.Data.SqlServer/DbContextOptionsBuilderExtensions.cs b/src/VirtoCommerce.PricingModule.Data.SqlServer/DbContextOptionsBuilderExtensions.cs
diff --git a/src/VirtoCommerce.PricingModule.Data.SqlServer/SqlServerDataAssemblyMarker.cs b/src/VirtoCommerce.PricingModule.Data.SqlServer/SqlServerDataAssemblyMarker.cs
@@ -0,0 +1,5 @@
+namespace VirtoCommerce.PricingModule.Data.SqlServer;
+
+public class SqlServerDataAssemblyMarker
+{
+}
diff --git a/src/VirtoCommerce.PricingModule.Data.SqlServer/SqlServerDbContextFactory.cs b/src/VirtoCommerce.PricingModule.Data.SqlServer/SqlServerDbContextFactory.cs
@@ -13,7 +13,7 @@ public PricingDbContext CreateDbContext(string[] args)
 
             builder.UseSqlServer(
                 connectionString,
-                db => db.MigrationsAssembly(typeof(SqlServerDbContextFactory).Assembly.GetName().Name));
+                db => db.MigrationsAssembly(typeof(SqlServerDataAssemblyMarker).Assembly.GetName().Name));
 
             return new PricingDbContext(builder.Options);
         }

diff --git a/...toCommerce.PricingModule.Data.SqlServer/VirtoCommerce.PricingModule.Data.SqlServer.csproj b/...toCommerce.PricingModule.Data.SqlServer/VirtoCommerce.PricingModule.Data.SqlServer.csproj
@@ -5,11 +5,11 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="VirtoCommerce.Platform.Data.SqlServer" Version="3.825.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data.SqlServer" Version="3.851.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.PricingModule.Data\VirtoCommerce.PricingModule.Data.csproj" />

diff --git a/src/VirtoCommerce.PricingModule.Data/VirtoCommerce.PricingModule.Data.csproj b/src/VirtoCommerce.PricingModule.Data/VirtoCommerce.PricingModule.Data.csproj
@@ -16,8 +16,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="VirtoCommerce.ExportModule.Data" Version="3.800.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.825.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.825.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.851.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.851.0" />
     <PackageReference Include="VirtoCommerce.SearchModule.Data" Version="3.800.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/VirtoCommerce.PricingModule.Web/Module.cs b/src/VirtoCommerce.PricingModule.Web/Module.cs
@@ -22,6 +22,9 @@
 using VirtoCommerce.Platform.Core.Settings;
 using VirtoCommerce.Platform.Core.Settings.Events;
 using VirtoCommerce.Platform.Data.Extensions;
+using VirtoCommerce.Platform.Data.MySql.Extensions;
+using VirtoCommerce.Platform.Data.PostgreSql.Extensions;
+using VirtoCommerce.Platform.Data.SqlServer.Extensions;
 using VirtoCommerce.Platform.Security.Authorization;
 using VirtoCommerce.PricingModule.Core;
 using VirtoCommerce.PricingModule.Core.Events;
@@ -61,13 +64,13 @@ public void Initialize(IServiceCollection serviceCollection)
                 switch (databaseProvider)
                 {
                     case "MySql":
-                        options.UseMySqlDatabase(connectionString);
+                        options.UseMySqlDatabase(connectionString, typeof(MySqlDataAssemblyMarker), Configuration);
                         break;
                     case "PostgreSql":
-                        options.UsePostgreSqlDatabase(connectionString);
+                        options.UsePostgreSqlDatabase(connectionString, typeof(PostgreSqlDataAssemblyMarker), Configuration);
                         break;
                     default:
-                        options.UseSqlServerDatabase(connectionString);
+                        options.UseSqlServerDatabase(connectionString, typeof(SqlServerDataAssemblyMarker), Configuration);
                         break;
                 }
             });

diff --git a/src/VirtoCommerce.PricingModule.Web/module.manifest b/src/VirtoCommerce.PricingModule.Web/module.manifest
@@ -3,14 +3,16 @@
   <id>VirtoCommerce.Pricing</id>
   <version>3.808.0</version>
   <version-tag />
-  <platformVersion>3.825.0</platformVersion>
+
+  <platformVersion>3.851.0</platformVersion>
   <dependencies>
     <dependency id="VirtoCommerce.Assets" version="3.800.0" />
     <dependency id="VirtoCommerce.Catalog" version="3.800.0" />
     <dependency id="VirtoCommerce.Core" version="3.800.0" />
     <dependency id="VirtoCommerce.Export" version="3.800.0" optional="true" />
     <dependency id="VirtoCommerce.Search" version="3.800.0" />
   </dependencies>
+
   <title>Pricing</title>
   <description>Robust pricing management functionality based on price list and dynamic evaluation</description>
   <authors>