tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-04-22 02:32:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 优化 dywhere IN 查询按 500 元素分割；#1091

Browse Source
This commit is contained in:
2881099 2022-04-30 16:29:24 +08:00
parent a5723c1773
commit 7425f33f24
3 changed files with 149 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.props
View File

@ -10,7 +10,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<Version>3.2.603</Version> <Version>3.2.605</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

114
FreeSql.Tests/FreeSql.Tests/Internal/CommonUtilsTest.cs
View File

File diff suppressed because one or more lines are too long

44
FreeSql/Internal/CommonUtils.cs
View File

@ -315,23 +315,32 @@ namespace FreeSql.Internal
var sb = new StringBuilder(); var sb = new StringBuilder();
var ie = dywhere as IEnumerable; var ie = dywhere as IEnumerable;
var ieidx = 0; var ieidx = 0;
var ieidx1ret = "";
var isEntityType = false; var isEntityType = false;
var isAny = false;
sb.Append(aliasAndDot).Append(this.QuoteSqlName(pk1.Attribute.Name)).Append(" IN ("); //or会造成扫全表 sb.Append(aliasAndDot).Append(this.QuoteSqlName(pk1.Attribute.Name)).Append(" IN ("); //or会造成扫全表
var idx = 0;
foreach (var i in ie) foreach (var i in ie)
{ {
isAny = true;
if (ieidx > 0) sb.Append(',');
if (ieidx == 0) if (ieidx == 0)
{ {
var itype = i.GetType(); var itype = i.GetType();
isEntityType = (itype == table.Type || itype.BaseType == table.Type); isEntityType = (itype == table.Type || itype.BaseType == table.Type);
} }
if (isEntityType) sb.Append(RewriteColumn(primarys[0], GetNoneParamaterSqlValue(null, null, primarys[0], primarys[0].Attribute.MapType, primarys[0].GetDbValue(i)))); if (++idx > 500)
else sb.Append(RewriteColumn(pk1, GetNoneParamaterSqlValue(null, null, pk1, pk1.Attribute.MapType, Utils.GetDataReaderValue(pk1.Attribute.MapType, i)))); {
++ieidx; sb.Append(") OR ").Append(aliasAndDot).Append(this.QuoteSqlName(pk1.Attribute.Name)).Append(" IN ("); //500元素分割
idx = 1;
}
if (idx > 1) sb.Append(",");
var val = isEntityType ? RewriteColumn(primarys[0], GetNoneParamaterSqlValue(null, null, primarys[0], primarys[0].Attribute.MapType, primarys[0].GetDbValue(i))) :
RewriteColumn(pk1, GetNoneParamaterSqlValue(null, null, pk1, pk1.Attribute.MapType, Utils.GetDataReaderValue(pk1.Attribute.MapType, i)));
sb.Append(val);
if (ieidx == 0) ieidx1ret = $"{aliasAndDot}{this.QuoteSqlName(pk1.Attribute.Name)} = {val}";
ieidx++;
} }
if (isAny == false) return ""; if (ieidx == 0) return "";
if (ieidx == 1) return ieidx1ret;
sb.Append(')'); sb.Append(')');
return sb.ToString(); return sb.ToString();
} }
@ -380,12 +389,27 @@ namespace FreeSql.Internal
var pk1 = primarys.FirstOrDefault(); var pk1 = primarys.FirstOrDefault();
if (primarys.Length == 1) if (primarys.Length == 1)
{ {
var sbin = new StringBuilder();
sbin.Append(aliasAndDot).Append(this.QuoteSqlName(pk1.Attribute.Name));
var indt = its.Select(a => pk1.GetDbValue(a)).Where(a => a != null).ToArray(); var indt = its.Select(a => pk1.GetDbValue(a)).Where(a => a != null).ToArray();
if (indt.Any() == false) return null; if (indt.Any() == false) return null;
var sbin = new StringBuilder();
sbin.Append(aliasAndDot).Append(this.QuoteSqlName(pk1.Attribute.Name));
if (indt.Length == 1) sbin.Append(" = ").Append(RewriteColumn(pk1, GetNoneParamaterSqlValue(null, null, pk1, pk1.Attribute.MapType, indt.First()))); if (indt.Length == 1) sbin.Append(" = ").Append(RewriteColumn(pk1, GetNoneParamaterSqlValue(null, null, pk1, pk1.Attribute.MapType, indt.First())));
else sbin.Append(" IN (").Append(string.Join(",", indt.Select(a => RewriteColumn(pk1, GetNoneParamaterSqlValue(null, null, pk1, pk1.Attribute.MapType, a))))).Append(')'); else
{
sbin.Append(" IN (");
var idx = 0;
foreach (var z in indt)
{
if (++idx > 500)
{
sbin.Append(") OR ").Append(aliasAndDot).Append(this.QuoteSqlName(pk1.Attribute.Name)).Append(" IN ("); //500元素分割
idx = 1;
}
if (idx > 1) sbin.Append(",");
sbin.Append(RewriteColumn(pk1, GetNoneParamaterSqlValue(null, null, pk1, pk1.Attribute.MapType, z)));
}
sbin.Append(')');
}
return sbin.ToString(); return sbin.ToString();
} }
var dicpk = its.Length > 5 ? new Dictionary<string, bool>() : null; var dicpk = its.Length > 5 ? new Dictionary<string, bool>() : null;