- 增加 IInsert/IUpdate BatchProgress 方法处理批量插入/更新时的进度;

This commit is contained in:
28810
2020-07-21 15:22:33 +08:00
parent a363ab82a7
commit f2f1495efc
11 changed files with 325 additions and 173 deletions

View File

@@ -1069,11 +1069,18 @@
Sqlite 5000 999<para></para>
<20>交瓷<E4BAA4><EFBFBD><E58A90><EFBFBD><E288A9><EFBFBD><E4BC90><EFBFBD><EFBFBD>(暺䁅恕)隡朞䌊<E69C9E><EFBFBD><E585B8>舀鰵鈭见𦛚嚗䔶<E59A97><EFBFBD><E99C82><EFBFBD><EFBFBD><EFBFBD>銵𣬚<E98AB5>摰峕㟲<E5B395><EFBFBD><E689BC>
</summary>
<param name="valuesLimit">指定根据 values 数量拆分执行</param>
<param name="parameterLimit">指定根据 parameters 数量拆分执行</param>
<param name="valuesLimit"><EFBFBD><EFBFBD><EFBFBD><EFBFBD>寞旿 values 銝𢠃<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></param>
<param name="parameterLimit"><EFBFBD><EFBFBD><EFBFBD><EFBFBD>寞旿 parameters 銝𢠃<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></param>
<param name="autoTransaction"><EFBFBD>臬炏<EFBFBD>芸𢆡撘<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></param>
<returns></returns>
</member>
<member name="M:FreeSql.IInsert`1.BatchProgress(System.Action{FreeSql.Internal.Model.BatchProgressStatus{`0}})">
<summary>
<20><EFBFBD><E5AFA5><EFBFBD><E689AF><EFBFBD><E5A19A><EFBFBD>鸌甈⊥<E79488>銵𣬚<E98AB5>餈𥕦漲<F0A595A6><EFBFBD><E59786>
</summary>
<param name="callback"><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>憪娍<EFBFBD></param>
<returns></returns>
</member>
<member name="M:FreeSql.IInsert`1.AsTable(System.Func{System.String,System.String})">
<summary>
霈曄蔭銵典<E98AB5><EFBFBD><E996AB><EFBFBD><EFBFBD><EFBFBD><E585B6><EFBFBD><EFBFBD>/<2F><>”嚗<E2809D><E59A97><EFBFBD><EFBFBD>1嚗𡁻<E59A97>霈方”<E696B9><EFBFBD>餈𥪜<E9A488><F0A5AA9C><EFBFBD><E6BD98>啗”<E59597><EFBFBD>
@@ -2142,11 +2149,18 @@
Sqlite 200 999<para></para>
<20>交瓷<E4BAA4><EFBFBD><E58A90><EFBFBD><E288A9><EFBFBD><E4BC90><EFBFBD><EFBFBD>(暺䁅恕)隡朞䌊<E69C9E><EFBFBD><E585B8>舀鰵鈭见𦛚嚗䔶<E59A97><EFBFBD><E99C82><EFBFBD><EFBFBD><EFBFBD>銵𣬚<E98AB5>摰峕㟲<E5B395><EFBFBD><E689BC>
</summary>
<param name="rowsLimit">指定根据 rows 数量拆分执行</param>
<param name="parameterLimit">指定根据 parameters 数量拆分执行</param>
<param name="rowsLimit"><EFBFBD><EFBFBD><EFBFBD><EFBFBD>寞旿 rows 銝𢠃<E98A9D><F0A2A083><EFBFBD><E59C88><EFBFBD><EFBFBD><EFBFBD><EFBFBD></param>
<param name="parameterLimit"><EFBFBD><EFBFBD><EFBFBD><EFBFBD>寞旿 parameters 銝𢠃<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></param>
<param name="autoTransaction"><EFBFBD>臬炏<EFBFBD>芸𢆡撘<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></param>
<returns></returns>
</member>
<member name="M:FreeSql.IUpdate`1.BatchProgress(System.Action{FreeSql.Internal.Model.BatchProgressStatus{`0}})">
<summary>
<20><EFBFBD><E5AFA5><EFBFBD><E689AF><EFBFBD><E5A19A><EFBFBD>鸌甈⊥<E79488>銵𣬚<E98AB5>餈𥕦漲<F0A595A6><EFBFBD><E59786>
</summary>
<param name="callback"><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>憪娍<EFBFBD></param>
<returns></returns>
</member>
<member name="M:FreeSql.IUpdate`1.SetSource(`0)">
<summary>
<20>湔鰵<E6B994>唳旿嚗諹挽蝵格凒<E6A0BC><EFBFBD>摰硺<E691B0>
@@ -2919,89 +2933,104 @@
頧砍之<E7A08D><EFBFBD>甇亦<E79487><E4BAA6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>鍂 Oracle/颲暹╪/鈭箏之<E7AE8F><EFBFBD>
</summary>
</member>
<member name="P:FreeSql.ICodeFirst.IsConfigEntityFromDbFirst">
<summary>
将数据库的主键、自增、索引设置导入,适用 DbFirst 模式,无须在实体类型上设置 [Column(IsPrimary)] 或者 ConfigEntity。此功能目前可用于 mysql/sqlserver/postgresql/oracle。<para></para>
本功能会影响 IFreeSql 首次访问的速度。<para></para>
若使用 CodeFirst 创建索引后,又直接在数据库上建了索引,若无本功能下一次 CodeFirst 迁移时数据库上创建的索引将被删除
<member name="P:Fre <20><EFBFBD>c#蝐餃<E89D90>嚗𢁾nt<6E><74>ong
</summary>
</member>
<member name="P:FreeSql.ICodeFirst.IsNoneCommandParameter">
<summary>
不使用命令参数化执行,针对 Insert/Update
</summary>
</member>
<member name="P:FreeSql.ICodeFirst.IsGenerateCommandParameterWithLambda">
<summary>
是否生成命令参数化执行,针对 lambda 表达式解析<para></para>
注意:常量不会参数化,变量才会做参数化<para></para>
var id = 100;
fsql.Select&lt;T&gt;().Where(a => a.id == id) 会参数化<para></para>
fsql.Select&lt;T&gt;().Where(a => a.id == 100) 不会参数化
</summary>
</member>
<member name="P:FreeSql.ICodeFirst.IsLazyLoading">
<summary>
延时加载导航属性对象,导航属性需要声明 virtual
</summary>
</member>
<member name="M:FreeSql.ICodeFirst.GetComparisonDDLStatements``1">
<summary>
将实体类型与数据库对比返回DDL语句
</summary>
<typeparam name="TEntity"></typeparam>
<param name="column"></param>
<returns></returns>
</member>
<member name="M:FreeSql.ICodeFirst.GetComparisonDDLStatements(System.Type[])">
<member name="M:FreeSql.IDbFirst.GetCsTypeInfo(FreeSql.DatabaseModel.DbColumnInfo)">
<summary>
将实体类型集合与数据库对比返回DDL语句
<EFBFBD><EFBFBD>c#蝐餃<E89D90>撖寡情
</summary>
<param name="entityTypes">实体类型</param>
<param name="column"></param>
<returns></returns>
</member>
<member name="M:FreeSql.ICodeFirst.GetComparisonDDLStatements(System.Type,System.String)">
<member name="M:FreeSql.IDbFirst.GetDataReaderMethod(FreeSql.DatabaseModel.DbColumnInfo)">
<summary>
将实体类型与数据库对比返回DDL语句指定表名
<EFBFBD><EFBFBD>ado.net霂餃<E99C82><E9A483><EFBFBD>, GetBoolean<61><6E>etInt64
</summary>
<param name="entityType">实体类型</param>
<param name="tableName">指定表名对比</param>
<param name="column"></param>
<returns></returns>
</member>
<member name="M:FreeSql.ICodeFirst.SyncStructure``1">
<member name="M:FreeSql.IDbFirst.GetCsStringify(FreeSql.DatabaseModel.DbColumnInfo)">
<summary>
同步实体类型到数据库<para></para>
注意:生产环境中谨慎使用
摨誩<EFBFBD><EFBFBD><EFBFBD>
</summary>
<typeparam name="TEntity"></typeparam>
<param name="column"></param>
<returns></returns>
</member>
<member name="M:FreeSql.ICodeFirst.SyncStructure(System.Type[])">
<member name="M:FreeSql.IDbFirst.GetCsParse(FreeSql.DatabaseModel.DbColumnInfo)">
<summary>
同步实体类型集合到数据库<para></para>
注意:生产环境中谨慎使用
<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
</summary>
<param name="entityTypes"></param>
<param name="column"></param>
<returns></returns>
</member>
<member name="M:FreeSql.ICodeFirst.SyncStructure(System.Type,System.String)">
<member name="M:FreeSql.IDbFirst.GetEnumsByDatabase(System.String[])">
<summary>
同步实体类型到数据库(指定表名)<para></para>
注意:生产环境中谨慎使用
<EFBFBD><EFBFBD><EFBFBD>唳旿摨𤘪<EFBFBD>銝曄掩<EFBFBD><EFBFBD><EFBFBD><EFBFBD>鍂 PostgreSQL
</summary>
<param name="entityType">实体类型</param>
<param name="tableName">指定表名对比</param>
<param name="database"></param>
<returns></returns>
</member>
<member name="M:FreeSql.ICodeFirst.GetDbInfo(System.Type)">
<member name="M:FreeSql.Internal.CommonProvider.InsertOrUpdateProvider`1.SplitSourceByIdentityValueIsNull(System.Collections.Generic.List{`0})">
<summary>
根据 System.Type 获取数据库信息
<EFBFBD><EFBFBD>摰硺<EFBFBD>蝐餅<EFBFBD><EFBFBD><EFBFBD>撅墧<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>銝支葵 List嚗峕<E59A97><E5B395><EFBFBD>Item1 merge嚗峕<E59A97><E5B395><EFBFBD>Item2 insert
</summary>
<param name="source"></param>
<returns></returns>
</member>
<member name="M:FreeSql.Internal.CommonProvider.InsertProvider`1.IgnoreCanInsert">
<summary>
AsType, Ctor, ClearData 銝匧<E98A9D><E58CA7>唳䲮<E594B3><E4B2AE><EFBFBD><E996AC><EFBFBD><EFBFBD><EFBFBD>
</summary>
</member>
<member name="M:FreeSql.Internal.CommonProvider.UpdateProvider`1.IgnoreCanUpdate">
<summary>
AsType, Ctor, ClearData 銝匧<E98A9D><E58CA7>唳䲮<E594B3><E4B2AE><EFBFBD><E996AC><EFBFBD><EFBFBD><EFBFBD>
</summary>
</member>
<member name="M:FreeSql.Internal.CommonUtils.GetPropertyCommentByDescriptionAttribute(System.Type)">
<summary>
<20><EFBFBD><E586BD><EFBFBD><E7B289> DescriptionAttribute 瘜券<E7989C><E588B8><EFBFBD>𧋦
</summary>
<param name="type"></param>
<returns></returns>
</member>
<member name="M:FreeSql.ICodeFirst.ConfigEntity``1(System.Action{FreeSql.DataAnnotations.TableFluent{``0}})">
<member name="M:FreeSql.Internal.CommonUtils.GetProperyCommentBySummary(System.Type)">
<summary>
FreeSql FluentApi 配置实体,方法名与特性相同
<EFBFBD><EFBFBD>撅墧<EFBFBD><EFBFBD>瘜券<EFBFBD><EFBFBD><EFBFBD>𧋦嚗屸<EFBFBD><EFBFBD> xml 霂餃<E99C82>
</summary>
<typeparam name="T"></typeparam>
<param name="entity"></param>
<param name="type"></param>
<returns>Dict嚗饂ey=撅墧<E69285><EFBFBD>嚗綋alue=瘜券<E7989C></returns>
</member>
<member name="M:FreeSql.Internal.GlobalFilter.Apply``1(System.String,System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}})">
<summary>
<20>𥕦遣銝<E981A3>銝芾<E98A9D>皛文膥
</summary>
<typeparam name="TEntity"></typeparam>
<param name="name"><EFBFBD><EFBFBD></param>
<param name="where">銵刻噢撘<EFBFBD></param>
<returns></returns>
</member>
<member name="P:FreeSql.Internal.Model.BatchProgressStatus`1.Data">
<summary>
敶枏<E695B6><E69E8F><EFBFBD><E6BBA2><EFBFBD><EFBFBD><E3BAAD>
</summary>
</member>
<member name="P:FreeSql.Internal.Model.BatchProgressStatus`1.Current">
<summary>
敶枏<E695B6><E69E8F>寞活
</summary>
</member>
<member name="P:FreeSql.Internal.Model.BatchProgressStatus`1.Total">
<summary>
<20>餅鸌甈⊥㺭<E28AA5><E3BAAD>
</summary>
</member>
<member name="T:FreeSql.Internal.Model.DynamicFilterInfo">
<summary>
<20>me="entity"></param>
<returns></returns>
</member>
<member name="M:FreeSql.ICodeFirst.ConfigEntity(System.Type,System.Action{FreeSql.DataAnnotations.TableFluent})">
@@ -3142,6 +3171,21 @@
<param name="where">銵刻噢撘<EFBFBD></param>
<returns></returns>
</member>
<member name="P:FreeSql.Internal.Model.BatchProgressStatus`1.Data">
<summary>
敶枏<E695B6><E69E8F><EFBFBD><E6BBA2><EFBFBD><EFBFBD><E3BAAD>
</summary>
</member>
<member name="P:FreeSql.Internal.Model.BatchProgressStatus`1.Current">
<summary>
敶枏<E695B6><E69E8F>寞活
</summary>
</member>
<member name="P:FreeSql.Internal.Model.BatchProgressStatus`1.Total">
<summary>
<20>餅鸌甈⊥㺭<E28AA5><E3BAAD>
</summary>
</member>
<member name="T:FreeSql.Internal.Model.DynamicFilterInfo">
<summary>
<20><EFBFBD><E586BD><EFBFBD>皛斗辺隞<E8BEBA>

View File

@@ -1,4 +1,5 @@
using System;
using FreeSql.Internal.Model;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
@@ -91,12 +92,19 @@ namespace FreeSql
/// Sqlite 5000 999<para></para>
/// 若没有事务传入,内部(默认)会自动开启新事务,保证拆包执行的完整性。
/// </summary>
/// <param name="valuesLimit">指定根据 values 数量拆分执行</param>
/// <param name="parameterLimit">指定根据 parameters 数量拆分执行</param>
/// <param name="valuesLimit">指定根据 values 上限数量拆分执行</param>
/// <param name="parameterLimit">指定根据 parameters 上限数量拆分执行</param>
/// <param name="autoTransaction">是否自动开启事务</param>
/// <returns></returns>
IInsert<T1> BatchOptions(int valuesLimit, int parameterLimit, bool autoTransaction = true);
/// <summary>
/// 批量执行时,分批次执行的进度状态
/// </summary>
/// <param name="callback">批量执行时的回调委托</param>
/// <returns></returns>
IInsert<T1> BatchProgress(Action<BatchProgressStatus<T1>> callback);
/// <summary>
/// 设置表名规则,可用于分库/分表参数1默认表名返回值新表名
/// </summary>

View File

@@ -1,4 +1,5 @@
using System;
using FreeSql.Internal.Model;
using System;
using System.Collections.Generic;
using System.Data.Common;
using System.Linq.Expressions;
@@ -39,12 +40,19 @@ namespace FreeSql
/// Sqlite 200 999<para></para>
/// 若没有事务传入,内部(默认)会自动开启新事务,保证拆包执行的完整性。
/// </summary>
/// <param name="rowsLimit">指定根据 rows 数量拆分执行</param>
/// <param name="parameterLimit">指定根据 parameters 数量拆分执行</param>
/// <param name="rowsLimit">指定根据 rows 上限数量拆分执行</param>
/// <param name="parameterLimit">指定根据 parameters 上限数量拆分执行</param>
/// <param name="autoTransaction">是否自动开启事务</param>
/// <returns></returns>
IUpdate<T1> BatchOptions(int rowsLimit, int parameterLimit, bool autoTransaction = true);
/// <summary>
/// 批量执行时,分批次执行的进度状态
/// </summary>
/// <param name="callback">批量执行时的回调委托</param>
/// <returns></returns>
IUpdate<T1> BatchProgress(Action<BatchProgressStatus<T1>> callback);
/// <summary>
/// 更新数据,设置更新的实体
/// </summary>

View File

@@ -26,6 +26,7 @@ namespace FreeSql.Internal.CommonProvider
public bool _noneParameter, _insertIdentity;
public int _batchValuesLimit, _batchParameterLimit;
public bool _batchAutoTransaction = true;
public Action<BatchProgressStatus<T1>> _batchProgress;
public DbParameter[] _params;
public DbTransaction _transaction;
public DbConnection _connection;
@@ -55,6 +56,7 @@ namespace FreeSql.Internal.CommonProvider
{
_batchValuesLimit = _batchParameterLimit = 0;
_batchAutoTransaction = true;
_batchProgress = null;
_insertIdentity = false;
_source.Clear();
_ignore.Clear();
@@ -96,6 +98,12 @@ namespace FreeSql.Internal.CommonProvider
return this;
}
public IInsert<T1> BatchProgress(Action<BatchProgressStatus<T1>> callback)
{
_batchProgress = callback;
return this;
}
public IInsert<T1> AppendData(T1 source)
{
if (source != null)
@@ -204,6 +212,7 @@ namespace FreeSql.Internal.CommonProvider
}
if (ss.Length == 1)
{
_batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, 1, 1));
ret = this.RawExecuteAffrows();
ClearData();
return ret;
@@ -221,6 +230,7 @@ namespace FreeSql.Internal.CommonProvider
for (var a = 0; a < ss.Length; a++)
{
_source = ss[a];
_batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
ret += this.RawExecuteAffrows();
}
}
@@ -236,6 +246,7 @@ namespace FreeSql.Internal.CommonProvider
for (var a = 0; a < ss.Length; a++)
{
_source = ss[a];
_batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
ret += this.RawExecuteAffrows();
}
_transaction.Commit();
@@ -276,6 +287,7 @@ namespace FreeSql.Internal.CommonProvider
}
if (ss.Length == 1)
{
_batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, 1, 1));
ret = this.RawExecuteIdentity();
ClearData();
return ret;
@@ -293,6 +305,7 @@ namespace FreeSql.Internal.CommonProvider
for (var a = 0; a < ss.Length; a++)
{
_source = ss[a];
_batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
if (a < ss.Length - 1) this.RawExecuteAffrows();
else ret = this.RawExecuteIdentity();
}
@@ -309,6 +322,7 @@ namespace FreeSql.Internal.CommonProvider
for (var a = 0; a < ss.Length; a++)
{
_source = ss[a];
_batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
if (a < ss.Length - 1) this.RawExecuteAffrows();
else ret = this.RawExecuteIdentity();
}
@@ -350,6 +364,7 @@ namespace FreeSql.Internal.CommonProvider
}
if (ss.Length == 1)
{
_batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, 1, 1));
ret = this.RawExecuteInserted();
ClearData();
return ret;
@@ -367,6 +382,7 @@ namespace FreeSql.Internal.CommonProvider
for (var a = 0; a < ss.Length; a++)
{
_source = ss[a];
_batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
ret.AddRange(this.RawExecuteInserted());
}
}
@@ -382,6 +398,7 @@ namespace FreeSql.Internal.CommonProvider
for (var a = 0; a < ss.Length; a++)
{
_source = ss[a];
_batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
ret.AddRange(this.RawExecuteInserted());
}
_transaction.Commit();

View File

@@ -32,6 +32,7 @@ namespace FreeSql.Internal.CommonProvider
public bool _noneParameter;
public int _batchRowsLimit, _batchParameterLimit;
public bool _batchAutoTransaction = true;
public Action<BatchProgressStatus<T1>> _batchProgress;
public DbTransaction _transaction;
public DbConnection _connection;
@@ -101,6 +102,12 @@ namespace FreeSql.Internal.CommonProvider
return this;
}
public IUpdate<T1> BatchProgress(Action<BatchProgressStatus<T1>> callback)
{
_batchProgress = callback;
return this;
}
protected void ValidateVersionAndThrow(int affrows)
{
if (_table.VersionColumn != null && _source.Count > 0)
@@ -144,6 +151,7 @@ namespace FreeSql.Internal.CommonProvider
var ret = 0;
if (ss.Length <= 1)
{
if (_source?.Any() == true) _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, 1, 1));
ret = this.RawExecuteAffrows();
ClearData();
return ret;
@@ -161,6 +169,7 @@ namespace FreeSql.Internal.CommonProvider
for (var a = 0; a < ss.Length; a++)
{
_source = ss[a];
_batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
ret += this.RawExecuteAffrows();
}
}
@@ -176,6 +185,7 @@ namespace FreeSql.Internal.CommonProvider
for (var a = 0; a < ss.Length; a++)
{
_source = ss[a];
_batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
ret += this.RawExecuteAffrows();
}
_transaction.Commit();
@@ -211,6 +221,7 @@ namespace FreeSql.Internal.CommonProvider
var ret = new List<T1>();
if (ss.Length <= 1)
{
if (_source?.Any() == true) _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, 1, 1));
ret = this.RawExecuteUpdated();
ClearData();
return ret;
@@ -228,6 +239,7 @@ namespace FreeSql.Internal.CommonProvider
for (var a = 0; a < ss.Length; a++)
{
_source = ss[a];
_batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
ret.AddRange(this.RawExecuteUpdated());
}
}
@@ -243,6 +255,7 @@ namespace FreeSql.Internal.CommonProvider
for (var a = 0; a < ss.Length; a++)
{
_source = ss[a];
_batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
ret.AddRange(this.RawExecuteUpdated());
}
_transaction.Commit();

View File

@@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Text;
namespace FreeSql.Internal.Model
{
public class BatchProgressStatus<T1>
{
/// <summary>
/// 当前操作的数据
/// </summary>
public IEnumerable<T1> Data { get; }
/// <summary>
/// 当前批次
/// </summary>
public int Current { get; }
/// <summary>
/// 总批次数量
/// </summary>
public int Total { get; }
public BatchProgressStatus(List<T1> data, int current, int total)
{
this.Data = data;
this.Current = current;
this.Total = total;
}
}
}