Skip to content

I
IoTSharp

jobily / IoTSharp

通知 3
Star 0
Fork 0
I
IoTSharp

体验新版 GitCode，发现更多精彩内容 >>

提交 9f536da0 编写于 作者: 麦壳饼's avatar 麦壳饼
浏览文件
操作

调整分表 开始时间问题。

上级 2a761d2d
隐藏空白更改
内联 并排
Showing with 61 addition and 542 deletion
IoTSharp.Data/Shardings/AbstractShardingApplicationDbContext.cs 已删除 100644 → 0
浏览文件 @ 2a761d2d
// using System;
// using System.Collections.Generic;
// using System.Linq;
// using System.Threading;
// using System.Threading.Tasks;
// using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
// using Microsoft.EntityFrameworkCore;
// using Microsoft.EntityFrameworkCore.ChangeTracking;
// using ShardingCore.Core.VirtualDatabase.VirtualDataSources;
// using ShardingCore.Core.VirtualRoutes.TableRoutes.RouteTails.Abstractions;
// using ShardingCore.EFCores.OptionsExtensions;
// using ShardingCore.Sharding;
// using ShardingCore.Sharding.Abstractions;
// using ShardingCore.Sharding.ShardingDbContextExecutors;
//
// namespace IoTSharp.Data
// {
// /// <summary>
// /// 因为直接让ApplicationDbContext支持sharding对程序影响太大
// /// 目前就暂时注释掉这个如果需要可以继承这个抽象
// /// </summary>
// public abstract class AbstractShardingApplicationDbContext:IdentityDbContext,IShardingDbContext, ISupportShardingReadWrite,ICurrentDbContextDiscover
// {
// private readonly IShardingDbContextExecutor _shardingDbContextExecutor;
// protected AbstractShardingApplicationDbContext(DbContextOptions options)
// {
// var wrapOptionsExtension = options.FindExtension<ShardingWrapOptionsExtension>();
// if (wrapOptionsExtension != null)
// {
// _shardingDbContextExecutor = new ShardingDbContextExecutor(this);
// }
// }
//
// /// <summary>
// /// 读写分离优先级
// /// </summary>
// public int ReadWriteSeparationPriority
// {
// get => _shardingDbContextExecutor.ReadWriteSeparationPriority;
// set => _shardingDbContextExecutor.ReadWriteSeparationPriority = value;
// }
// /// <summary>
// /// 是否使用读写分离
// /// </summary>
// public bool ReadWriteSeparation
// {
// get => _shardingDbContextExecutor.ReadWriteSeparation;
// set => _shardingDbContextExecutor.ReadWriteSeparation = value;
// }
//
// /// <summary>
// /// 是否是真正的执行者
// /// </summary>
// private bool isExecutor => _shardingDbContextExecutor == null;
//
// //public void ShardingUpgrade()
// //{
// // //isExecutor = true;
// //}
//
// public DbContext GetDbContext(string dataSourceName, CreateDbContextStrategyEnum strategy, IRouteTail routeTail)
// {
// var dbContext = _shardingDbContextExecutor.CreateDbContext(strategy, dataSourceName, routeTail);
//
// return dbContext;
// }
//
// /// <summary>
// /// 根据对象创建通用的dbcontext
// /// </summary>
// /// <typeparam name="TEntity"></typeparam>
// /// <param name="entity"></param>
// /// <returns></returns>
// public DbContext CreateGenericDbContext<TEntity>(TEntity entity) where TEntity : class
// {
// var dbContext = _shardingDbContextExecutor.CreateGenericDbContext(entity);
//
// return dbContext;
// }
//
// public IVirtualDataSource GetVirtualDataSource()
// {
// return _shardingDbContextExecutor.GetVirtualDataSource();
// }
//
// public override EntityEntry Add(object entity)
// {
// if (isExecutor)
// base.Add(entity);
// return CreateGenericDbContext(entity).Add(entity);
// }
//
// public override EntityEntry<TEntity> Add<TEntity>(TEntity entity)
// {
// if (isExecutor)
// return base.Add(entity);
// return CreateGenericDbContext(entity).Add(entity);
// }
//
//
// public override ValueTask<EntityEntry<TEntity>> AddAsync<TEntity>(TEntity entity, CancellationToken cancellationToken = new CancellationToken())
// {
// if (isExecutor)
// return base.AddAsync(entity, cancellationToken);
// return CreateGenericDbContext(entity).AddAsync(entity, cancellationToken);
// }
//
// public override ValueTask<EntityEntry> AddAsync(object entity, CancellationToken cancellationToken = new CancellationToken())
// {
// if (isExecutor)
// return base.AddAsync(entity, cancellationToken);
// return CreateGenericDbContext(entity).AddAsync(entity, cancellationToken);
// }
//
// public override void AddRange(params object[] entities)
// {
// if (isExecutor)
// {
// base.AddRange(entities);
// return;
// }
// var groups = entities.Select(o =>
// {
// var dbContext = CreateGenericDbContext(o);
// return new
// {
// DbContext = dbContext,
// Entity = o
// };
// }).GroupBy(g => g.DbContext);
//
// foreach (var group in groups)
// {
// group.Key.AddRange(group.Select(o => o.Entity));
// }
// }
//
// public override void AddRange(IEnumerable<object> entities)
// {
// if (isExecutor)
// {
// base.AddRange(entities);
// return;
// }
// var groups = entities.Select(o =>
// {
// var dbContext = CreateGenericDbContext(o);
// return new
// {
// DbContext = dbContext,
// Entity = o
// };
// }).GroupBy(g => g.DbContext);
//
// foreach (var group in groups)
// {
// group.Key.AddRange(group.Select(o => o.Entity));
// }
// }
//
// public override async Task AddRangeAsync(params object[] entities)
// {
// if (isExecutor)
// {
// await base.AddRangeAsync(entities);
// return;
// }
// var groups = entities.Select(o =>
// {
// var dbContext = CreateGenericDbContext(o);
// return new
// {
// DbContext = dbContext,
// Entity = o
// };
// }).GroupBy(g => g.DbContext);
//
// foreach (var group in groups)
// {
// await group.Key.AddRangeAsync(group.Select(o => o.Entity));
// }
// }
//
// public override async Task AddRangeAsync(IEnumerable<object> entities, CancellationToken cancellationToken = new CancellationToken())
// {
// if (isExecutor)
// {
// await base.AddRangeAsync(entities, cancellationToken);
// return;
// }
// var groups = entities.Select(o =>
// {
// var dbContext = CreateGenericDbContext(o);
// return new
// {
// DbContext = dbContext,
// Entity = o
// };
// }).GroupBy(g => g.DbContext);
//
// foreach (var group in groups)
// {
// await group.Key.AddRangeAsync(group.Select(o => o.Entity));
// }
// }
//
// public override EntityEntry<TEntity> Attach<TEntity>(TEntity entity)
// {
// if (isExecutor)
// return base.Attach(entity);
// return CreateGenericDbContext(entity).Attach(entity);
// }
//
// public override EntityEntry Attach(object entity)
// {
// if (isExecutor)
// return base.Attach(entity);
// return CreateGenericDbContext(entity).Attach(entity);
// }
//
// public override void AttachRange(params object[] entities)
// {
// if (isExecutor)
// {
// base.AttachRange(entities);
// return;
// }
// var groups = entities.Select(o =>
// {
// var dbContext = CreateGenericDbContext(o);
// return new
// {
// DbContext = dbContext,
// Entity = o
// };
// }).GroupBy(g => g.DbContext);
//
// foreach (var group in groups)
// {
// group.Key.AttachRange(group.Select(o => o.Entity));
// }
// }
//
// public override void AttachRange(IEnumerable<object> entities)
// {
// if (isExecutor)
// {
// base.AttachRange(entities);
// return;
// }
// var groups = entities.Select(o =>
// {
// var dbContext = CreateGenericDbContext(o);
// return new
// {
// DbContext = dbContext,
// Entity = o
// };
// }).GroupBy(g => g.DbContext);
//
// foreach (var group in groups)
// {
// group.Key.AttachRange(group.Select(o => o.Entity));
// }
// }
//
//
// //public override DatabaseFacade Database => _dbContextCaches.Any()
// // ? _dbContextCaches.First().Value.Database
// // : GetDbContext(true, string.Empty).Database;
//
// public override EntityEntry<TEntity> Entry<TEntity>(TEntity entity)
// {
// if (isExecutor)
// return base.Entry(entity);
// return CreateGenericDbContext(entity).Entry(entity);
// }
//
// public override EntityEntry Entry(object entity)
// {
// if (isExecutor)
// return base.Entry(entity);
// return CreateGenericDbContext(entity).Entry(entity);
// }
//
// public override EntityEntry<TEntity> Update<TEntity>(TEntity entity)
// {
// if (isExecutor)
// return base.Update(entity);
// return CreateGenericDbContext(entity).Update(entity);
// }
//
// public override EntityEntry Update(object entity)
// {
// if (isExecutor)
// return base.Update(entity);
// return CreateGenericDbContext(entity).Update(entity);
// }
//
// public override void UpdateRange(params object[] entities)
// {
// if (isExecutor)
// {
// base.UpdateRange(entities);
// return;
// }
// var groups = entities.Select(o =>
// {
// var dbContext = CreateGenericDbContext(o);
// return new
// {
// DbContext = dbContext,
// Entity = o
// };
// }).GroupBy(g => g.DbContext);
//
// foreach (var group in groups)
// {
// group.Key.UpdateRange(group.Select(o => o.Entity));
// }
// }
//
// public override void UpdateRange(IEnumerable<object> entities)
// {
// if (isExecutor)
// {
// base.UpdateRange(entities);
// return;
// }
// var groups = entities.Select(o =>
// {
// var dbContext = CreateGenericDbContext(o);
// return new
// {
// DbContext = dbContext,
// Entity = o
// };
// }).GroupBy(g => g.DbContext);
//
// foreach (var group in groups)
// {
// group.Key.UpdateRange(group.Select(o => o.Entity));
// }
// }
//
// public override EntityEntry<TEntity> Remove<TEntity>(TEntity entity)
// {
// if (isExecutor)
// return base.Remove(entity);
// return CreateGenericDbContext(entity).Remove(entity);
// }
//
// public override EntityEntry Remove(object entity)
// {
// if (isExecutor)
// return base.Remove(entity);
// return CreateGenericDbContext(entity).Remove(entity);
// }
//
// public override void RemoveRange(params object[] entities)
// {
// if (isExecutor)
// {
// base.RemoveRange(entities);
// return;
// }
// var groups = entities.Select(o =>
// {
// var dbContext = CreateGenericDbContext(o);
// return new
// {
// DbContext = dbContext,
// Entity = o
// };
// }).GroupBy(g => g.DbContext);
//
// foreach (var group in groups)
// {
// group.Key.RemoveRange(group.Select(o => o.Entity));
// }
// }
//
// public override void RemoveRange(IEnumerable<object> entities)
// {
// if (isExecutor)
// {
// base.RemoveRange(entities);
// return;
// }
// var groups = entities.Select(o =>
// {
// var dbContext = CreateGenericDbContext(o);
// return new
// {
// DbContext = dbContext,
// Entity = o
// };
// }).GroupBy(g => g.DbContext);
//
// foreach (var group in groups)
// {
// group.Key.RemoveRange(group.Select(o => o.Entity));
// }
// }
//
// public override int SaveChanges()
// {
//
// if (isExecutor)
// return base.SaveChanges();
// return this.SaveChanges(true);
// }
//
// public override int SaveChanges(bool acceptAllChangesOnSuccess)
// {
// if (isExecutor)
// return base.SaveChanges(acceptAllChangesOnSuccess);
// //ApplyShardingConcepts();
// int i = 0;
// //如果是内部开的事务就内部自己消化
// if (Database.CurrentTransaction == null && _shardingDbContextExecutor.IsMultiDbContext)
// {
// using (var tran = Database.BeginTransaction())
// {
// i = _shardingDbContextExecutor.SaveChanges(acceptAllChangesOnSuccess);
// tran.Commit();
// }
// }
// else
// {
// i = _shardingDbContextExecutor.SaveChanges(acceptAllChangesOnSuccess);
// }
//
// return i;
// }
//
//
// public override Task<int> SaveChangesAsync(CancellationToken cancellationToken = new CancellationToken())
// {
// if (isExecutor)
// return base.SaveChangesAsync(cancellationToken);
// return this.SaveChangesAsync(true, cancellationToken);
// }
//
// public override async Task<int> SaveChangesAsync(bool acceptAllChangesOnSuccess, CancellationToken cancellationToken = new CancellationToken())
// {
// if (isExecutor)
// return await base.SaveChangesAsync(acceptAllChangesOnSuccess, cancellationToken);
// //ApplyShardingConcepts();
// int i = 0;
// //如果是内部开的事务就内部自己消化
// if (Database.CurrentTransaction == null && _shardingDbContextExecutor.IsMultiDbContext)
// {
// using (var tran = await Database.BeginTransactionAsync((CancellationToken)cancellationToken))
// {
// i = await _shardingDbContextExecutor.SaveChangesAsync(acceptAllChangesOnSuccess, cancellationToken);
//
// await tran.CommitAsync(cancellationToken);
// }
// }
// else
// {
// i = await _shardingDbContextExecutor.SaveChangesAsync(acceptAllChangesOnSuccess, cancellationToken);
// }
//
//
// return i;
// }
//
// public override void Dispose()
// {
//
// if (isExecutor)
// {
// base.Dispose();
// }
// else
// {
// _shardingDbContextExecutor.Dispose();
// base.Dispose();
// }
// }
//
// public override async ValueTask DisposeAsync()
// {
// if (isExecutor)
// {
// await base.DisposeAsync();
// }
// else
// {
// await _shardingDbContextExecutor.DisposeAsync();
//
// await base.DisposeAsync();
// }
// }
// public Task RollbackAsync(CancellationToken cancellationToken = new CancellationToken())
// {
// return _shardingDbContextExecutor.RollbackAsync(cancellationToken);
// }
//
// public Task CommitAsync(CancellationToken cancellationToken = new CancellationToken())
// {
// return _shardingDbContextExecutor.CommitAsync(cancellationToken);
// }
//
// public void NotifyShardingTransaction()
// {
// _shardingDbContextExecutor.NotifyShardingTransaction();
// }
//
// public void Rollback()
// {
// _shardingDbContextExecutor.Rollback();
// }
//
// public void Commit()
// {
// _shardingDbContextExecutor.Commit();
// }
//
// public IDictionary<string, IDataSourceDbContext> GetCurrentDbContexts()
// {
// return _shardingDbContextExecutor.GetCurrentDbContexts();
// }
// }
// }
\ No newline at end of file
IoTSharp.Data/Shardings/Routes/TelemetryDataDayRoute.cs
浏览文件 @ 9f536da0
using System;
using IoTSharp.Contracts;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using ShardingCore.Core.EntityMetadatas;
using ShardingCore.Core.ServiceProviders;
using ShardingCore.VirtualRoutes.Days;
namespace IoTSharp.Data.Shardings.Routes
{
public class TelemetryDataDayRoute:AbstractSimpleShardingDayKeyDateTimeVirtualTableRoute<TelemetryData>
{
private readonly AppSettings _setting;
public TelemetryDataDayRoute(IShardingProvider provider)
{
var options = provider.ApplicationServiceProvider.GetService<IOptions<AppSettings>>();
_setting = options.Value;
}
public override void Configure(EntityMetadataTableBuilder<TelemetryData> builder)
{
builder.ShardingProperty(o => o.DateTime);
......@@ -18,9 +30,7 @@ namespace IoTSharp.Data.Shardings.Routes
public override DateTime GetBeginTime()
{
//原则上不应该使用datetime.now但是我看你之前的程序是这么写的如果是now那么每次启动都算是开始时间之前的表可能会访问不到
//因为访问只会访问begintime之后的时间
return DateTime.Now;
return _setting.ShardingBeginTime;
}
}
}
\ No newline at end of file
IoTSharp.Data/Shardings/Routes/TelemetryDataHourRoute.cs
浏览文件 @ 9f536da0
using System;
using System.Collections.Generic;
using IoTSharp.Contracts;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using ShardingCore.Core.EntityMetadatas;
using ShardingCore.Core.ServiceProviders;
using ShardingCore.Core.VirtualRoutes;
using ShardingCore.VirtualRoutes.Abstractions;
......@@ -8,6 +12,13 @@ namespace IoTSharp.Data.Shardings.Routes
{
public class TelemetryDataHourRoute:AbstractShardingTimeKeyDateTimeVirtualTableRoute<TelemetryData>
{
private readonly AppSettings _setting;
public TelemetryDataHourRoute(IShardingProvider provider)
{
var options = provider.ApplicationServiceProvider.GetService<IOptions<AppSettings>>();
_setting = options.Value;
}
public override void Configure(EntityMetadataTableBuilder<TelemetryData> builder)
{
builder.ShardingProperty(o => o.DateTime);
......@@ -63,9 +74,7 @@ namespace IoTSharp.Data.Shardings.Routes
public DateTime GetBeginTime()
{
//原则上不应该使用datetime.now但是我看你之前的程序是这么写的如果是now那么每次启动都算是开始时间之前的表可能会访问不到
//因为访问只会访问begintime之后的时间
return DateTime.Now;
return _setting.ShardingBeginTime;
}
public override bool AutoCreateTableByTime()
......
IoTSharp.Data/Shardings/Routes/TelemetryDataMinuteRoute.cs
浏览文件 @ 9f536da0
using System;
using System.Collections.Generic;
using IoTSharp.Contracts;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using ShardingCore.Core.EntityMetadatas;
using ShardingCore.Core.ServiceProviders;
using ShardingCore.Core.VirtualRoutes;
using ShardingCore.VirtualRoutes.Abstractions;
......@@ -8,6 +12,13 @@ namespace IoTSharp.Data.Shardings.Routes
{
public class TelemetryDataMinuteRoute:AbstractShardingTimeKeyDateTimeVirtualTableRoute<TelemetryData>
{
private readonly AppSettings _setting;
public TelemetryDataMinuteRoute(IShardingProvider provider)
{
var options = provider.ApplicationServiceProvider.GetService<IOptions<AppSettings>>();
_setting = options.Value;
}
public override void Configure(EntityMetadataTableBuilder<TelemetryData> builder)
{
builder.ShardingProperty(o => o.DateTime);
......@@ -63,9 +74,7 @@ namespace IoTSharp.Data.Shardings.Routes
public DateTime GetBeginTime()
{
//原则上不应该使用datetime.now但是我看你之前的程序是这么写的如果是now那么每次启动都算是开始时间之前的表可能会访问不到
//因为访问只会访问begintime之后的时间
return DateTime.Now;
return _setting.ShardingBeginTime;
}
public override bool AutoCreateTableByTime()
......
IoTSharp.Data/Shardings/Routes/TelemetryDataMonthRoute.cs
浏览文件 @ 9f536da0
using System;
using IoTSharp.Contracts;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using ShardingCore.Core.EntityMetadatas;
using ShardingCore.Core.ServiceProviders;
using ShardingCore.VirtualRoutes.Months;
namespace IoTSharp.Data.Shardings.Routes
{
public class TelemetryDataMonthRoute:AbstractSimpleShardingMonthKeyDateTimeVirtualTableRoute<TelemetryData>
{
private readonly AppSettings _setting;
public TelemetryDataMonthRoute(IShardingProvider provider)
{
var options= provider.ApplicationServiceProvider.GetService<IOptions<AppSettings>>();
_setting = options.Value;
}
public override void Configure(EntityMetadataTableBuilder<TelemetryData> builder)
{
builder.ShardingProperty(o => o.DateTime);
......@@ -18,9 +29,7 @@ namespace IoTSharp.Data.Shardings.Routes
public override DateTime GetBeginTime()
{
//原则上不应该使用datetime.now但是我看你之前的程序是这么写的如果是now那么每次启动都算是开始时间之前的表可能会访问不到
//因为访问只会访问begintime之后的时间
return DateTime.Now;
return _setting.ShardingBeginTime;
}
}
}
\ No newline at end of file
IoTSharp.Data/Shardings/Routes/TelemetryDataYearRoute.cs
浏览文件 @ 9f536da0
using System;
using IoTSharp.Contracts;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using ShardingCore.Core.EntityMetadatas;
using ShardingCore.Core.ServiceProviders;
using ShardingCore.VirtualRoutes.Years;
namespace IoTSharp.Data.Shardings.Routes
{
public class TelemetryDataYearRoute:AbstractSimpleShardingYearKeyDateTimeVirtualTableRoute<TelemetryData>
{
private readonly AppSettings _setting;
public TelemetryDataYearRoute(IShardingProvider provider)
{
var options = provider.ApplicationServiceProvider.GetService<IOptions<AppSettings>>();
_setting = options.Value;
}
public override void Configure(EntityMetadataTableBuilder<TelemetryData> builder)
{
builder.ShardingProperty(o => o.DateTime);
......@@ -18,9 +29,7 @@ namespace IoTSharp.Data.Shardings.Routes
public override DateTime GetBeginTime()
{
//原则上不应该使用datetime.now但是我看你之前的程序是这么写的如果是now那么每次启动都算是开始时间之前的表可能会访问不到
//因为访问只会访问begintime之后的时间
return DateTime.Now;
return _setting.ShardingBeginTime;
}
}
}
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或