移除efcore.sharding使用shardingcore

280780363 · Sep 28, 2022 · ce1117a · ce1117a
1 parent c036b16
commit ce1117a
Show file tree

Hide file tree

Showing 41 changed files with 905 additions and 83 deletions.
diff --git a/IoTSharp.Data.Storage/IoTSharp.Data.MySQL/IoTSharp.Data.MySQL.csproj b/IoTSharp.Data.Storage/IoTSharp.Data.MySQL/IoTSharp.Data.MySQL.csproj
@@ -15,7 +15,6 @@
     <PackageReference Include="AspNetCore.HealthChecks.UI.MySql.Storage" Version="6.0.5" />
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.9" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.2" />
-	  <PackageReference Include="EFCore.Sharding.MySql" Version="6.0.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/IoTSharp.Data.Storage/IoTSharp.Data.MySQL/IoTSharpDataBuilderExtensions.cs b/IoTSharp.Data.Storage/IoTSharp.Data.MySQL/IoTSharpDataBuilderExtensions.cs
@@ -1,5 +1,4 @@
 
-using EFCore.Sharding;
 using IoTSharp;
 using IoTSharp.Contracts;
 using IoTSharp.Data;
@@ -8,6 +7,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Diagnostics;
+using ShardingCore.Core.ShardingConfigurations;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
@@ -38,10 +38,16 @@ public static void  ConfigureMySql(this IServiceCollection services,   string co
             healthChecksUI.AddMySqlStorage(connectionString);
 
         }
-        public static void UseMySqlToSharding(this IShardingBuilder builder, string connectionString, ShardingByDateMode expandBy)
+        public static void UseMySqlToSharding(this ShardingConfigOptions options)
         {
-            builder.AddDataSource(connectionString, ReadWriteType.Read | ReadWriteType.Write, DatabaseType.MySql);
-            builder.SetDateSharding<TelemetryData>(nameof(TelemetryData.DateTime),  (ExpandByDateMode)(int)expandBy, DateTime.Now);
+            options.UseShardingQuery((conStr, builder) =>
+            {
+                builder.UseMySql(conStr, new MySqlServerVersion(new Version()));
+            });
+            options.UseShardingTransaction((conn, builder) =>
+            {
+                builder.UseMySql(conn, new MySqlServerVersion(new Version()));
+            });
         }
     }
 }
diff --git a/IoTSharp.Data.Storage/IoTSharp.Data.Oracle/IoTSharp.Data.Oracle.csproj b/IoTSharp.Data.Storage/IoTSharp.Data.Oracle/IoTSharp.Data.Oracle.csproj
@@ -12,7 +12,6 @@
 	<ItemGroup>
 		<PackageReference Include="AspNetCore.HealthChecks.Oracle" Version="6.0.3" />
 		<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="6.0.5" />
-		<PackageReference Include="EFCore.Sharding.Oracle" Version="6.0.7" />
 		<PackageReference Include="Oracle.EntityFrameworkCore" Version="6.21.61" />
 	</ItemGroup>
 

diff --git a/IoTSharp.Data.Storage/IoTSharp.Data.Oracle/IoTSharpDataBuilderExtensions.cs b/IoTSharp.Data.Storage/IoTSharp.Data.Oracle/IoTSharpDataBuilderExtensions.cs
@@ -1,12 +1,12 @@
 
-using EFCore.Sharding;
 using IoTSharp;
 using IoTSharp.Contracts;
 using IoTSharp.Data;
 using IoTSharp.Data.Oracle;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using System;
+using ShardingCore.Core.ShardingConfigurations;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
@@ -29,10 +29,16 @@ public static void ConfigureOracle(this IServiceCollection services, string conn
 
         }
 
-        public static void UseOracleToSharding(this IShardingBuilder builder, string connectionString, ShardingByDateMode expandBy)
+        public static void UseOracleToSharding(this ShardingConfigOptions options)
         {
-            builder.AddDataSource(connectionString, ReadWriteType.Read | ReadWriteType.Write, DatabaseType.Oracle);
-            builder.SetDateSharding<TelemetryData>(nameof(TelemetryData.DateTime), (ExpandByDateMode)(int)expandBy, DateTime.Now);
+            options.UseShardingQuery((conStr, builder) =>
+            {
+                builder.UseOracle(conStr);
+            });
+            options.UseShardingTransaction((conn, builder) =>
+            {
+                builder.UseOracle(conn);
+            });
         }
     }
 }
diff --git a/IoTSharp.Data.Storage/IoTSharp.Data.PostgreSQL/IoTSharp.Data.PostgreSQL.csproj b/IoTSharp.Data.Storage/IoTSharp.Data.PostgreSQL/IoTSharp.Data.PostgreSQL.csproj
@@ -12,7 +12,6 @@
 	<ItemGroup>
 		<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="6.0.2" />
 		<PackageReference Include="AspNetCore.HealthChecks.UI.PostgreSQL.Storage" Version="6.0.4" />
-		<PackageReference Include="EFCore.Sharding.PostgreSql" Version="6.0.7" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/IoTSharp.Data.Storage/IoTSharp.Data.PostgreSQL/IoTSharpDataBuilderExtensions.cs b/IoTSharp.Data.Storage/IoTSharp.Data.PostgreSQL/IoTSharpDataBuilderExtensions.cs
@@ -1,12 +1,12 @@
 
-using EFCore.Sharding;
 using IoTSharp;
 using IoTSharp.Contracts;
 using IoTSharp.Data;
 using IoTSharp.Data.PostgreSQL;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using System;
+using ShardingCore.Core.ShardingConfigurations;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
@@ -29,10 +29,16 @@ public static void ConfigureNpgsql(this IServiceCollection services, string conn
 
         }
 
-        public static void UseNpgsqlToSharding(this IShardingBuilder builder, string connectionString, ShardingByDateMode expandBy)
+        public static void UseNpgsqlToSharding(this ShardingConfigOptions options)
         {
-            builder.AddDataSource(connectionString, ReadWriteType.Read | ReadWriteType.Write, DatabaseType.PostgreSql);
-            builder.SetDateSharding<TelemetryData>(nameof(TelemetryData.DateTime),(ExpandByDateMode)(int)expandBy, DateTime.Now);
+            options.UseShardingQuery((conStr, builder) =>
+            {
+                builder.UseNpgsql(conStr);
+            });
+            options.UseShardingTransaction((conn, builder) =>
+            {
+                builder.UseNpgsql(conn);
+            });
         }
     }
 }
diff --git a/IoTSharp.Data.Storage/IoTSharp.Data.SqlServer/IoTSharp.Data.SqlServer.csproj b/IoTSharp.Data.Storage/IoTSharp.Data.SqlServer/IoTSharp.Data.SqlServer.csproj
@@ -12,7 +12,6 @@
   <ItemGroup>
     <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="6.0.2" />
     <PackageReference Include="AspNetCore.HealthChecks.UI.SqlServer.Storage" Version="6.0.5" />
-    <PackageReference Include="EFCore.Sharding.SqlServer" Version="6.0.7" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.9" />
   </ItemGroup>
 

diff --git a/IoTSharp.Data.Storage/IoTSharp.Data.SqlServer/IoTSharpDataBuilderExtensions.cs b/IoTSharp.Data.Storage/IoTSharp.Data.SqlServer/IoTSharpDataBuilderExtensions.cs
@@ -1,12 +1,12 @@
 
-using EFCore.Sharding;
 using IoTSharp;
 using IoTSharp.Contracts;
 using IoTSharp.Data;
 using IoTSharp.Data.SqlServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using System;
+using ShardingCore.Core.ShardingConfigurations;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
@@ -29,10 +29,16 @@ public static void ConfigureSqlServer(this IServiceCollection services, string c
 
         }
 
-        public static void UseSqlServerToSharding(this IShardingBuilder builder, string connectionString, ShardingByDateMode expandBy)
+        public static void UseSqlServerToSharding(this ShardingConfigOptions options)
         {
-            builder.AddDataSource(connectionString, ReadWriteType.Read | ReadWriteType.Write, DatabaseType.SqlServer);
-            builder.SetDateSharding<TelemetryData>(nameof(TelemetryData.DateTime), (ExpandByDateMode)(int)expandBy, DateTime.Now);
+            options.UseShardingQuery((conStr, builder) =>
+            {
+                builder.UseSqlServer(conStr);
+            });
+            options.UseShardingTransaction((conn, builder) =>
+            {
+                builder.UseSqlServer(conn);
+            });
         }
     }
 }
diff --git a/IoTSharp.Data.Storage/IoTSharp.Data.Sqlite/IoTSharp.Data.Sqlite.csproj b/IoTSharp.Data.Storage/IoTSharp.Data.Sqlite/IoTSharp.Data.Sqlite.csproj
@@ -13,7 +13,6 @@
 		<PackageReference Include="AspNetCore.HealthChecks.UI.Sqlite.Storage" Version="6.0.5" />
 		<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.5" />
 		<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.9" />
-		<PackageReference Include="EFCore.Sharding.SQLite" Version="6.0.7" />
 	</ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\IoTSharp.Data\IoTSharp.Data.csproj" />

diff --git a/IoTSharp.Data.Storage/IoTSharp.Data.Sqlite/IoTSharpDataBuilderExtensions.cs b/IoTSharp.Data.Storage/IoTSharp.Data.Sqlite/IoTSharpDataBuilderExtensions.cs
@@ -1,5 +1,4 @@
 
-using EFCore.Sharding;
 using IoTSharp;
 using IoTSharp.Contracts;
 using IoTSharp.Data;
@@ -8,6 +7,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Linq;
+using ShardingCore.Core.ShardingConfigurations;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
@@ -30,10 +30,16 @@ public static void ConfigureSqlite(this IServiceCollection services, string conn
 
         }
 
-        public static void UseSQLiteToSharding(this IShardingBuilder builder, string connectionString, ShardingByDateMode expandBy)
+        public static void UseSQLiteToSharding(this ShardingConfigOptions options)
         {
-            builder.AddDataSource(connectionString, ReadWriteType.Read | ReadWriteType.Write, DatabaseType.SQLite);
-            builder.SetDateSharding<TelemetryData>(nameof(TelemetryData.DateTime), (ExpandByDateMode)(int)expandBy, DateTime.Now);
+            options.UseShardingQuery((conStr, builder) =>
+            {
+                builder.UseSqlite(conStr);
+            });
+            options.UseShardingTransaction((conn, builder) =>
+            {
+                builder.UseSqlite(conn);
+            });
         }
 
         public static void SetCaseInsensitiveSearchesForSQLite(this ModelBuilder modelBuilder)

diff --git a/IoTSharp.Data.TimeSeries/IoTSharp.Data.TimeSeries.csproj b/IoTSharp.Data.TimeSeries/IoTSharp.Data.TimeSeries.csproj
@@ -9,7 +9,7 @@
 
 		<PackageReference Include="Apache.IoTDB.Data" Version="0.13.0.8" />
 
-		<PackageReference Include="EFCore.Sharding" Version="6.0.7" />
+<!--		<PackageReference Include="EFCore.Sharding" Version="6.0.7" />-->
 
 		<PackageReference Include="hyjiacan.pinyin4net" Version="4.1.1" />
 

diff --git a/IoTSharp.Data.TimeSeries/ShardingStorage.cs b/IoTSharp.Data.TimeSeries/ShardingStorage.cs
@@ -1,5 +1,4 @@
-using EFCore.Sharding;
-using IoTSharp.Contracts;
+using IoTSharp.Contracts;
 using IoTSharp.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
@@ -10,6 +9,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using IoTSharp.Data.Shardings;
 
 namespace IoTSharp.Storage
 {
@@ -92,10 +92,10 @@ public Task<List<TelemetryDataDto>> LoadTelemetryAsync(Guid deviceId, string key
                 {
                     using (var scope = _scopeFactor.CreateScope())
                     {
-                        using (var context = scope.ServiceProvider.GetService<IShardingDbAccessor>())
+                        using (var context = scope.ServiceProvider.GetRequiredService<ShardingDbContext>())
                         {
                             var lst = new List<TelemetryDataDto>();
-                            var kv = context.GetIShardingQueryable<TelemetryData>()
+                            var kv = context.Set<TelemetryData>()
                                 .Where(t => t.DeviceId == deviceId && t.DateTime >= begin && t.DateTime < end)
                                 .ToList().Select(t => new TelemetryDataDto() { DateTime = t.DateTime, KeyName = t.KeyName, Value = t.ToObject() });
                             if (!string.IsNullOrEmpty(keys))
@@ -128,7 +128,7 @@ public Task<List<TelemetryDataDto>> LoadTelemetryAsync(Guid deviceId, string key
             {
                 using var scope = _scopeFactor.CreateScope();
 
-                using (var db = scope.ServiceProvider.GetService<IShardingDbAccessor>())
+                using (var db = scope.ServiceProvider.GetRequiredService<ShardingDbContext>())
                 {
                     var lst = new List<TelemetryData>();
                     msg.MsgBody.ToList().ForEach(kp =>
@@ -141,8 +141,8 @@ public Task<List<TelemetryDataDto>> LoadTelemetryAsync(Guid deviceId, string key
                                              telemetries.Add(tdata);
                                          }
                                      });
-                    int ret = await db.InsertAsync(lst);
-                    _logger.LogInformation($"新增({msg.DeviceId})遥测数据{ret}");
+                    await db.AddAsync(lst);
+                    _logger.LogInformation($"新增({msg.DeviceId})遥测数据1");
                 }
             }
             catch (Exception ex)

diff --git a/IoTSharp.Data/ApplicationDbContext.cs b/IoTSharp.Data/ApplicationDbContext.cs
@@ -8,13 +8,13 @@
 using Microsoft.Extensions.DependencyInjection;
 using IoTSharp.Data.Configurations;
 using IoTSharp.Contracts;
+using ShardingCore.Core.VirtualRoutes.TableRoutes.RouteTails.Abstractions;
+using ShardingCore.Sharding.Abstractions;
 
 namespace IoTSharp.Data
 {
     public class ApplicationDbContext : IdentityDbContext
     {
-
-
         public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options)
             : base(options)
         {
@@ -46,9 +46,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             base.OnModelCreating(modelBuilder);
         }
 
-
-
-
         public DbSet<Tenant> Tenant { get; set; }
         public DbSet<Customer> Customer { get; set; }
         public DbSet<Relationship> Relationship { get; set; }

diff --git a/IoTSharp.Data/IoTSharp.Data.csproj b/IoTSharp.Data/IoTSharp.Data.csproj
@@ -23,6 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="6.0.9" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.9" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="ShardingCore" Version="6.6.0.36" />
 
   </ItemGroup>