- 修复 批量插入 Values 数量限制超出的判断;

This commit is contained in:
28810
2019-11-25 22:14:09 +08:00
parent e29ac93a67
commit 20e06ef3a2
3 changed files with 120 additions and 67 deletions

View File

@ -147,37 +147,21 @@ namespace FreeSql.Internal.CommonProvider
parameterLimit = parameterLimit - 1;
if (_source == null || _source.Any() == false) return new List<T1>[0];
if (_source.Count == 1) return new[] { _source };
if (_noneParameter)
{
if (_source.Count < valuesLimit) return new[] { _source };
var execCount = (int)Math.Ceiling(1.0 * _source.Count / valuesLimit);
var ret = new List<T1>[execCount];
for (var a = 0; a < execCount; a++)
{
var subSource = new List<T1>();
subSource = _source.GetRange(a * valuesLimit, Math.Min(valuesLimit, _source.Count - a * valuesLimit));
ret[a] = subSource;
}
return ret;
}
else
var takeMax = valuesLimit;
if (_noneParameter == false)
{
var colSum = _table.Columns.Count - _ignore.Count;
var takeMax = parameterLimit / colSum;
var pamTotal = colSum * _source.Count;
if (pamTotal < parameterLimit) return new[] { _source };
var execCount = (int)Math.Ceiling(1.0 * pamTotal / takeMax / colSum);
var ret = new List<T1>[execCount];
for (var a = 0; a < execCount; a++)
{
var subSource = new List<T1>();
subSource = _source.GetRange(a * takeMax, Math.Min(takeMax, _source.Count - a * takeMax));
ret[a] = subSource;
}
return ret;
takeMax = parameterLimit / colSum;
if (takeMax > valuesLimit) takeMax = valuesLimit;
}
if (_source.Count <= takeMax) return new[] { _source };
var execCount = (int)Math.Ceiling(1.0 * _source.Count / takeMax);
var ret = new List<T1>[execCount];
for (var a = 0; a < execCount; a++)
ret[a] = _source.GetRange(a * takeMax, Math.Min(takeMax, _source.Count - a * takeMax));
return ret;
}
protected int SplitExecuteAffrows(int valuesLimit, int parameterLimit)
{

View File

@ -107,37 +107,21 @@ namespace FreeSql.Internal.CommonProvider
parameterLimit = parameterLimit - 1;
if (_source == null || _source.Any() == false) return new List<T1>[0];
if (_source.Count == 1) return new[] { _source };
if (_noneParameter)
{
if (_source.Count < valuesLimit) return new[] { _source };
var execCount = (int)Math.Ceiling(1.0 * _source.Count / valuesLimit);
var ret = new List<T1>[execCount];
for (var a = 0; a < execCount; a++)
{
var subSource = new List<T1>();
subSource = _source.GetRange(a * valuesLimit, Math.Min(valuesLimit, _source.Count - a * valuesLimit));
ret[a] = subSource;
}
return ret;
}
else
var takeMax = valuesLimit;
if (_noneParameter == false)
{
var colSum = _table.Columns.Count - _ignore.Count;
var takeMax = parameterLimit / colSum;
var pamTotal = colSum * _source.Count;
if (pamTotal < parameterLimit) return new[] { _source };
var execCount = (int)Math.Ceiling(1.0 * pamTotal / takeMax / colSum);
var ret = new List<T1>[execCount];
for (var a = 0; a < execCount; a++)
{
var subSource = new List<T1>();
subSource = _source.GetRange(a * takeMax, Math.Min(takeMax, _source.Count - a * takeMax));
ret[a] = subSource;
}
return ret;
takeMax = parameterLimit / colSum;
if (takeMax > valuesLimit) takeMax = valuesLimit;
}
if (_source.Count <= takeMax) return new[] { _source };
var execCount = (int)Math.Ceiling(1.0 * _source.Count / takeMax);
var ret = new List<T1>[execCount];
for (var a = 0; a < execCount; a++)
ret[a] = _source.GetRange(a * takeMax, Math.Min(takeMax, _source.Count - a * takeMax));
return ret;
}
protected int SplitExecuteAffrows(int valuesLimit, int parameterLimit)
{