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

artem-dudarev · artem-dudarev · commit 035ddad19bcd · 2024-09-13T13:40:14.000+02:00
diff --git a/.editorconfig b/.editorconfig
@@ -102,7 +102,7 @@ csharp_preserve_single_line_statements = false
 csharp_preserve_single_line_blocks = true
 csharp_using_directive_placement = outside_namespace:silent
 csharp_prefer_simple_using_statement = true:suggestion
-csharp_style_namespace_declarations = block_scoped:silent
+csharp_style_namespace_declarations = file_scoped:silent
 csharp_style_prefer_method_group_conversion = true:silent
 csharp_style_prefer_top_level_statements = true:silent
 csharp_style_expression_bodied_lambdas = true:silent
diff --git a/src/VirtoCommerce.CatalogModule.Core/VirtoCommerce.CatalogModule.Core.csproj b/src/VirtoCommerce.CatalogModule.Core/VirtoCommerce.CatalogModule.Core.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.800.0" />
     <PackageReference Include="VirtoCommerce.ExportModule.Core" Version="3.800.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.825.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.832.3" />
     <PackageReference Include="VirtoCommerce.SearchModule.Core" Version="3.800.0" />
   </ItemGroup>
 </Project>
diff --git a/src/VirtoCommerce.CatalogModule.Data.MySql/DbContextOptionsBuilderExtensions.cs b/src/VirtoCommerce.CatalogModule.Data.MySql/DbContextOptionsBuilderExtensions.cs
diff --git a/src/VirtoCommerce.CatalogModule.Data.MySql/MySqlDataAssemblyMarker.cs b/src/VirtoCommerce.CatalogModule.Data.MySql/MySqlDataAssemblyMarker.cs
@@ -0,0 +1,5 @@
+namespace VirtoCommerce.CatalogModule.Data.MySql;
+
+public class MySqlDataAssemblyMarker
+{
+}
diff --git a/src/VirtoCommerce.CatalogModule.Data.MySql/MySqlDbContextFactory.cs b/src/VirtoCommerce.CatalogModule.Data.MySql/MySqlDbContextFactory.cs
@@ -16,7 +16,7 @@ public CatalogDbContext CreateDbContext(string[] args)
                 connectionString,
                 ResolveServerVersion(serverVersion, connectionString),
                 db => db
-                    .MigrationsAssembly(typeof(MySqlDbContextFactory).Assembly.GetName().Name));
+                    .MigrationsAssembly(typeof(MySqlDataAssemblyMarker).Assembly.GetName().Name));
 
             return new CatalogDbContext(builder.Options);
         }
diff --git a/src/VirtoCommerce.CatalogModule.Data.MySql/VirtoCommerce.CatalogModule.Data.MySql.csproj b/src/VirtoCommerce.CatalogModule.Data.MySql/VirtoCommerce.CatalogModule.Data.MySql.csproj
@@ -9,7 +9,7 @@
       <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.832.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.CatalogModule.Data\VirtoCommerce.CatalogModule.Data.csproj" />
diff --git a/src/VirtoCommerce.CatalogModule.Data.PostgreSql/DbContextOptionsBuilderExtensions.cs b/src/VirtoCommerce.CatalogModule.Data.PostgreSql/DbContextOptionsBuilderExtensions.cs
diff --git a/src/VirtoCommerce.CatalogModule.Data.PostgreSql/PostgreSqlDataAssemblyMarker.cs b/src/VirtoCommerce.CatalogModule.Data.PostgreSql/PostgreSqlDataAssemblyMarker.cs
@@ -0,0 +1,5 @@
+namespace VirtoCommerce.CatalogModule.Data.PostgreSql;
+
+public class PostgreSqlDataAssemblyMarker
+{
+}
diff --git a/src/VirtoCommerce.CatalogModule.Data.PostgreSql/PostgreSqlDbContextFactory.cs b/src/VirtoCommerce.CatalogModule.Data.PostgreSql/PostgreSqlDbContextFactory.cs
@@ -13,7 +13,7 @@ public CatalogDbContext CreateDbContext(string[] args)
 
             builder.UseNpgsql(
                 connectionString,
-                db => db.MigrationsAssembly(typeof(PostgreSqlDbContextFactory).Assembly.GetName().Name));
+                db => db.MigrationsAssembly(typeof(PostgreSqlDataAssemblyMarker).Assembly.GetName().Name));
 
             return new CatalogDbContext(builder.Options);
         }
diff --git a/src/VirtoCommerce.CatalogModule.Data.PostgreSql/VirtoCommerce.CatalogModule.Data.PostgreSql.csproj b/src/VirtoCommerce.CatalogModule.Data.PostgreSql/VirtoCommerce.CatalogModule.Data.PostgreSql.csproj
@@ -9,7 +9,7 @@
       <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.832.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.CatalogModule.Data\VirtoCommerce.CatalogModule.Data.csproj" />
diff --git a/src/VirtoCommerce.CatalogModule.Data.SqlServer/DbContextOptionsBuilderExtensions.cs b/src/VirtoCommerce.CatalogModule.Data.SqlServer/DbContextOptionsBuilderExtensions.cs
diff --git a/src/VirtoCommerce.CatalogModule.Data.SqlServer/SqlServerDataAssemblyMarker.cs b/src/VirtoCommerce.CatalogModule.Data.SqlServer/SqlServerDataAssemblyMarker.cs
@@ -0,0 +1,5 @@
+namespace VirtoCommerce.CatalogModule.Data.SqlServer;
+
+public class SqlServerDataAssemblyMarker
+{
+}
diff --git a/src/VirtoCommerce.CatalogModule.Data.SqlServer/SqlServerDbContextFactory.cs b/src/VirtoCommerce.CatalogModule.Data.SqlServer/SqlServerDbContextFactory.cs
@@ -13,7 +13,7 @@ public CatalogDbContext CreateDbContext(string[] args)
 
             builder.UseSqlServer(
                 connectionString,
-                db => db.MigrationsAssembly(typeof(SqlServerDbContextFactory).Assembly.GetName().Name));
+                db => db.MigrationsAssembly(typeof(SqlServerDataAssemblyMarker).Assembly.GetName().Name));
 
             return new CatalogDbContext(builder.Options);
         }
diff --git a/src/VirtoCommerce.CatalogModule.Data.SqlServer/VirtoCommerce.CatalogModule.Data.SqlServer.csproj b/src/VirtoCommerce.CatalogModule.Data.SqlServer/VirtoCommerce.CatalogModule.Data.SqlServer.csproj
@@ -9,7 +9,7 @@
       <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.832.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.CatalogModule.Data\VirtoCommerce.CatalogModule.Data.csproj" />
diff --git a/src/VirtoCommerce.CatalogModule.Data/VirtoCommerce.CatalogModule.Data.csproj b/src/VirtoCommerce.CatalogModule.Data/VirtoCommerce.CatalogModule.Data.csproj
@@ -14,14 +14,13 @@
     <SonarQubeTestProject>false</SonarQubeTestProject>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="11.8.1" />
     <PackageReference Include="Google.Apis.YouTube.v3" Version="1.64.0.3205" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="VirtoCommerce.AssetsModule.Core" Version="3.800.0" />
     <PackageReference Include="VirtoCommerce.ExportModule.Data" Version="3.800.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.825.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Hangfire" Version="3.825.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.825.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.832.3" />
+    <PackageReference Include="VirtoCommerce.Platform.Hangfire" Version="3.832.3" />
+    <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.832.3" />
     <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.800.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/VirtoCommerce.CatalogModule.Web/Module.cs b/src/VirtoCommerce.CatalogModule.Web/Module.cs
@@ -50,6 +50,9 @@
 using VirtoCommerce.Platform.Core.Security;
 using VirtoCommerce.Platform.Core.Settings;
 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.SearchModule.Core.Model;
 using VirtoCommerce.SearchModule.Core.Services;
@@ -81,13 +84,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.CatalogModule.Web/module.manifest b/src/VirtoCommerce.CatalogModule.Web/module.manifest
@@ -3,7 +3,8 @@
   <id>VirtoCommerce.Catalog</id>
   <version>3.811.2</version>
   <version-tag />
-  <platformVersion>3.825.0</platformVersion>
+
+  <platformVersion>3.832.3</platformVersion>
   <dependencies>
     <dependency id="VirtoCommerce.Assets" version="3.800.0" />
     <dependency id="VirtoCommerce.BulkActionsModule" version="3.800.0" optional="true" />
@@ -12,6 +13,7 @@
     <dependency id="VirtoCommerce.Search" version="3.800.0" />
     <dependency id="VirtoCommerce.Store" version="3.800.0" />
   </dependencies>
+
   <title>Catalog</title>
   <description>Easily manage your products, categories, variations, and properties</description>
   <authors>
diff --git a/tests/VirtoCommerce.CatalogModule.Tests/VirtoCommerce.CatalogModule.Tests.csproj b/tests/VirtoCommerce.CatalogModule.Tests/VirtoCommerce.CatalogModule.Tests.csproj
@@ -21,7 +21,7 @@
     <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-    <PackageReference Include="VirtoCommerce.Testing" Version="3.825.0" />
+    <PackageReference Include="VirtoCommerce.Testing" Version="3.832.3" />
     <PackageReference Include="xunit" Version="2.6.2" />
     <PackageReference Include="xunit.runner.console" Version="2.6.2">
       <PrivateAssets>all</PrivateAssets>

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public CatalogDbContext CreateDbContext(string[] args)`
`16`	`16`	`connectionString,`
`17`	`17`	`ResolveServerVersion(serverVersion, connectionString),`
`18`	`18`	`db => db`
`19`		`- .MigrationsAssembly(typeof(MySqlDbContextFactory).Assembly.GetName().Name));`
	`19`	`+ .MigrationsAssembly(typeof(MySqlDataAssemblyMarker).Assembly.GetName().Name));`
`20`	`20`
`21`	`21`	`return new CatalogDbContext(builder.Options);`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public CatalogDbContext CreateDbContext(string[] args)`
`13`	`13`
`14`	`14`	`builder.UseNpgsql(`
`15`	`15`	`connectionString,`
`16`		`- db => db.MigrationsAssembly(typeof(PostgreSqlDbContextFactory).Assembly.GetName().Name));`
	`16`	`+ db => db.MigrationsAssembly(typeof(PostgreSqlDataAssemblyMarker).Assembly.GetName().Name));`
`17`	`17`
`18`	`18`	`return new CatalogDbContext(builder.Options);`
`19`	`19`	`}`