Skip to content

Commit 9b37e22

Browse files
michelebastionemichelebastione
authored
Merge pull request #724 from michelebastione/master
Added some small optimizations to Dictionaries and Enumerables
2 parents d845ee4 + 3491c96 commit 9b37e22

File tree

5 files changed

+73
-67
lines changed

5 files changed

+73
-67
lines changed

‎src/MiniExcel/OpenXml/ExcelOpenXmlSheetReader.cs

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,11 @@ public IEnumerable<IDictionary<string, object>> Query(bool useHeaderRow, string
322322
{
323323
_mergeCells.MergesValues[aR] = cellValue;
324324
}
325-
else if (_mergeCells.MergesMap.ContainsKey(aR))
325+
else if (_mergeCells.MergesMap.TryGetValue(aR, out var mergeKey))
326326
{
327-
var mergeKey = _mergeCells.MergesMap[aR];
328327
object mergeValue = null;
329-
if (_mergeCells.MergesValues.ContainsKey(mergeKey))
330-
mergeValue = _mergeCells.MergesValues[mergeKey];
328+
if (_mergeCells.MergesValues.TryGetValue(mergeKey, out var value))
329+
mergeValue = value;
331330
cellValue = mergeValue;
332331
}
333332
}
@@ -398,9 +397,8 @@ private void SetCellsValueAndHeaders(object cellValue, bool useHeaderRow, ref Di
398397
}
399398
else
400399
{
401-
if (headRows.ContainsKey(columnIndex))
400+
if (headRows.TryGetValue(columnIndex, out var key))
402401
{
403-
var key = headRows[columnIndex];
404402
cell[key] = cellValue;
405403
}
406404
}
@@ -467,10 +465,9 @@ private void SetCellsValueAndHeaders(object cellValue, bool useHeaderRow, ref Di
467465
{
468466
foreach (var alias in pInfo.ExcelColumnAliases)
469467
{
470-
if (headersDic.ContainsKey(alias))
468+
if (headersDic.TryGetValue(alias, out var columnId))
471469
{
472470
object newV = null;
473-
var columnId = headersDic[alias];
474471
var columnName = keys[columnId];
475472
item.TryGetValue(columnName, out var itemValue);
476473

@@ -490,9 +487,8 @@ private void SetCellsValueAndHeaders(object cellValue, bool useHeaderRow, ref Di
490487
{
491488
item.TryGetValue(pInfo.ExcelIndexName, out itemValue);
492489
}
493-
else if (headersDic.ContainsKey(pInfo.ExcelColumnName))
490+
else if (headersDic.TryGetValue(pInfo.ExcelColumnName, out var columnId))
494491
{
495-
var columnId = headersDic[pInfo.ExcelColumnName];
496492
var columnName = keys[columnId];
497493
item.TryGetValue(columnName, out itemValue);
498494
}
@@ -822,7 +818,7 @@ public IEnumerable<IDictionary<string, object>> QueryRange(bool useHeaderRow, st
822818
// if sheets count > 1 need to read xl/_rels/workbook.xml.rels
823819
var sheets = _archive.entries.Where(w => w.FullName.StartsWith("xl/worksheets/sheet", StringComparison.OrdinalIgnoreCase)
824820
|| w.FullName.StartsWith("/xl/worksheets/sheet", StringComparison.OrdinalIgnoreCase)
825-
);
821+
).ToList();
826822
ZipArchiveEntry sheetEntry = null;
827823
if (sheetName != null)
828824
{
@@ -832,7 +828,7 @@ public IEnumerable<IDictionary<string, object>> QueryRange(bool useHeaderRow, st
832828
throw new InvalidOperationException("Please check sheetName/Index is correct");
833829
sheetEntry = sheets.Single(w => w.FullName == $"xl/{s.Path}" || w.FullName == $"/xl/{s.Path}" || w.FullName == s.Path || s.Path == $"/{w.FullName}");
834830
}
835-
else if (sheets.Count() > 1)
831+
else if (sheets.Count > 1)
836832
{
837833
SetWorkbookRels(_archive.entries);
838834
var s = _sheetRecords[0];
@@ -1086,13 +1082,9 @@ public IEnumerable<IDictionary<string, object>> QueryRange(bool useHeaderRow, st
10861082
{
10871083
_mergeCells.MergesValues[aR] = cellValue;
10881084
}
1089-
else if (_mergeCells.MergesMap.ContainsKey(aR))
1085+
else if (_mergeCells.MergesMap.TryGetValue(aR, out var mergeKey))
10901086
{
1091-
var mergeKey = _mergeCells.MergesMap[aR];
1092-
object mergeValue = null;
1093-
if (_mergeCells.MergesValues.ContainsKey(mergeKey))
1094-
mergeValue = _mergeCells.MergesValues[mergeKey];
1095-
cellValue = mergeValue;
1087+
_mergeCells.MergesValues.TryGetValue(mergeKey, out cellValue);
10961088
}
10971089
}
10981090
////2022-09-24跳过endcell结束单元格所以在的列
@@ -1194,15 +1186,16 @@ public IEnumerable<IDictionary<string, object>> QueryRange(bool useHeaderRow, st
11941186
{
11951187
foreach (var alias in pInfo.ExcelColumnAliases)
11961188
{
1197-
if (headersDic.ContainsKey(alias))
1189+
if (headersDic.TryGetValue(alias, out var value))
11981190
{
11991191
object newV = null;
1200-
object itemValue = item[keys[headersDic[alias]]];
1192+
object itemValue = item[keys[value]];
12011193

12021194
if (itemValue == null)
12031195
continue;
12041196

1205-
newV = TypeHelper.TypeMapping(v, pInfo, newV, itemValue, rowIndex, startCell, configuration);
1197+
newV = TypeHelper.TypeMapping(v, pInfo, newV, itemValue, rowIndex, startCell,
1198+
configuration);
12061199
}
12071200
}
12081201
}
@@ -1213,8 +1206,8 @@ public IEnumerable<IDictionary<string, object>> QueryRange(bool useHeaderRow, st
12131206
object itemValue = null;
12141207
if (pInfo.ExcelIndexName != null && keys.Contains(pInfo.ExcelIndexName))
12151208
itemValue = item[pInfo.ExcelIndexName];
1216-
else if (headersDic.ContainsKey(pInfo.ExcelColumnName))
1217-
itemValue = item[keys[headersDic[pInfo.ExcelColumnName]]];
1209+
else if (headersDic.TryGetValue(pInfo.ExcelColumnName, out var value))
1210+
itemValue = item[keys[value]];
12181211

12191212
if (itemValue == null)
12201213
continue;

‎src/MiniExcel/SaveByTemplate/ExcelOpenXmlTemplate.Impl.cs

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -482,9 +482,8 @@ private void WriteSheetXml(Stream stream, XmlDocument doc, XmlNode sheetData, bo
482482
rowXml.Replace(key, "");
483483
continue;
484484
}
485-
if (!dic.ContainsKey(propInfo.Key))
485+
if (!dic.TryGetValue(propInfo.Key, out var cellValue))
486486
continue;
487-
var cellValue = dic[propInfo.Key];
488487
if (cellValue == null)
489488
{
490489
rowXml.Replace(key, "");
@@ -899,9 +898,9 @@ private void ReplaceSharedStringsToStr(IDictionary<int, string> sharedStrings, r
899898
if (t == "s")
900899
{
901900
//need to check sharedstring exist or not
902-
if (sharedStrings.ContainsKey(int.Parse(v.InnerText)))
901+
if (sharedStrings.TryGetValue(int.Parse(v.InnerText), out var shared))
903902
{
904-
v.InnerText = sharedStrings[int.Parse(v.InnerText)];
903+
v.InnerText = shared;
905904
// change type = str and replace its value
906905
c.SetAttribute("t", "str");
907906
}
@@ -935,11 +934,11 @@ private void UpdateDimensionAndGetRowsInfo(IDictionary<string, object> inputMaps
935934
var r = c.GetAttribute("r");
936935

937936
// ==== mergecells ====
938-
if (this.XMergeCellInfos.ContainsKey(r))
937+
if (this.XMergeCellInfos.TryGetValue(r, out var merCell))
939938
{
940939
if (xRowInfo.RowMercells == null)
941940
xRowInfo.RowMercells = new List<XMergeCell>();
942-
xRowInfo.RowMercells.Add(this.XMergeCellInfos[r]);
941+
xRowInfo.RowMercells.Add(merCell);
943942
}
944943

945944
if (changeRowIndex)
@@ -962,7 +961,7 @@ private void UpdateDimensionAndGetRowsInfo(IDictionary<string, object> inputMaps
962961
continue;
963962

964963
// TODO: default if not contain property key, clean the template string
965-
if (!inputMaps.ContainsKey(propNames[0]))
964+
if (!inputMaps.TryGetValue(propNames[0], out var cellValue))
966965
{
967966
if (_configuration.IgnoreTemplateParameterMissing)
968967
{
@@ -975,14 +974,14 @@ private void UpdateDimensionAndGetRowsInfo(IDictionary<string, object> inputMaps
975974
}
976975
}
977976

978-
var cellValue = inputMaps[propNames[0]]; // 1. From left to right, only the first set is used as the basis for the list
977+
//cellValue = inputMaps[propNames[0]] - 1. From left to right, only the first set is used as the basis for the list
979978
if (cellValue is IEnumerable && !(cellValue is string))
980979
{
981-
if (this.XMergeCellInfos.ContainsKey(r))
980+
if (xRowInfo.IEnumerableMercell == null)
982981
{
983-
if (xRowInfo.IEnumerableMercell == null)
982+
if (this.XMergeCellInfos.TryGetValue(r, out var info))
984983
{
985-
xRowInfo.IEnumerableMercell = this.XMergeCellInfos[r];
984+
xRowInfo.IEnumerableMercell = info;
986985
}
987986
}
988987

@@ -1065,14 +1064,13 @@ private void UpdateDimensionAndGetRowsInfo(IDictionary<string, object> inputMaps
10651064
v.InnerText = v.InnerText.Replace($"{{{{{propNames[0]}}}}}", propNames[1]);
10661065
break;
10671066
}
1068-
if (!xRowInfo.PropsMap.ContainsKey(propNames[1]))
1067+
if (!xRowInfo.PropsMap.TryGetValue(propNames[1], out var prop))
10691068
{
10701069
v.InnerText = v.InnerText.Replace($"{{{{{propNames[0]}.{propNames[1]}}}}}", "");
10711070
continue;
10721071
throw new InvalidDataException($"{propNames[0]} doesn't have {propNames[1]} property");
10731072
}
10741073
// auto check type https://github.com/shps951023/MiniExcel/issues/177
1075-
var prop = xRowInfo.PropsMap[propNames[1]];
10761074
var type = prop.UnderlyingTypePropType; //avoid nullable
10771075

10781076
if (isMultiMatch)

‎src/MiniExcel/Utils/CustomPropertyHelper.cs

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ internal static List<ExcelColumnInfo> SortCustomProps(List<ExcelColumnInfo> prop
8888
// https://github.com/shps951023/MiniExcel/issues/142
8989
//TODO: need optimize performance
9090

91-
var withCustomIndexProps = props.Where(w => w.ExcelColumnIndex != null && w.ExcelColumnIndex > -1);
91+
var withCustomIndexProps = props.Where(w => w.ExcelColumnIndex != null && w.ExcelColumnIndex > -1).ToList();
9292
if (withCustomIndexProps.GroupBy(g => g.ExcelColumnIndex).Any(_ => _.Count() > 1))
93-
throw new InvalidOperationException($"Duplicate column name");
93+
throw new InvalidOperationException("Duplicate column name");
9494

9595
var maxColumnIndex = props.Count - 1;
96-
if (withCustomIndexProps.Any())
96+
if (withCustomIndexProps.Count != 0)
9797
maxColumnIndex = Math.Max((int)withCustomIndexProps.Max(w => w.ExcelColumnIndex), maxColumnIndex);
9898

9999
var withoutCustomIndexProps = props.Where(w => w.ExcelColumnIndex == null || w.ExcelColumnIndex == -1).ToList();
@@ -136,21 +136,19 @@ internal static List<ExcelColumnInfo> GetExcelCustomPropertyInfos(Type type, str
136136
if (props.Count == 0)
137137
throw new InvalidOperationException($"{type.Name} un-ignore properties count can't be 0");
138138

139+
var withCustomIndexProps = props.Where(w => w.ExcelColumnIndex != null && w.ExcelColumnIndex > -1);
140+
if (withCustomIndexProps.GroupBy(g => g.ExcelColumnIndex).Any(_ => _.Count() > 1))
141+
throw new InvalidOperationException("Duplicate column name");
142+
var maxkey = keys.Last();
143+
var maxIndex = ColumnHelper.GetColumnIndex(maxkey);
144+
foreach (var p in props)
139145
{
140-
var withCustomIndexProps = props.Where(w => w.ExcelColumnIndex != null && w.ExcelColumnIndex > -1);
141-
if (withCustomIndexProps.GroupBy(g => g.ExcelColumnIndex).Any(_ => _.Count() > 1))
142-
throw new InvalidOperationException($"Duplicate column name");
143-
var maxkey = keys.Last();
144-
var maxIndex = ColumnHelper.GetColumnIndex(maxkey);
145-
foreach (var p in props)
146+
if (p.ExcelColumnIndex != null)
146147
{
147-
if (p.ExcelColumnIndex != null)
148-
{
149-
if (p.ExcelColumnIndex > maxIndex)
150-
throw new ArgumentException($"ExcelColumnIndex {p.ExcelColumnIndex} over haeder max index {maxkey}");
151-
if (p.ExcelColumnName == null)
152-
throw new InvalidOperationException($"{p.Property.Info.DeclaringType.Name} {p.Property.Name}'s ExcelColumnIndex {p.ExcelColumnIndex} can't find excel column name");
153-
}
148+
if (p.ExcelColumnIndex > maxIndex)
149+
throw new ArgumentException($"ExcelColumnIndex {p.ExcelColumnIndex} over haeder max index {maxkey}");
150+
if (p.ExcelColumnName == null)
151+
throw new InvalidOperationException($"{p.Property.Info.DeclaringType.Name} {p.Property.Name}'s ExcelColumnIndex {p.ExcelColumnIndex} can't find excel column name");
154152
}
155153
}
156154

‎src/MiniExcel/Utils/ListHelper.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ public static class IEnumerableHelper
88
{
99
public static bool StartsWith<T>(this IList<T> span, IList<T> value) where T : IEquatable<T>
1010
{
11-
if (value.Count() == 0)
11+
if (value.Count == 0)
1212
return true;
1313

14-
var b = span.Take(value.Count());
15-
if (b.Count() != value.Count())
14+
var b = span.Take(value.Count);
15+
var bCount = b.Count();
16+
if (bCount != value.Count)
1617
return false;
1718

18-
for (int i = 0; i < b.Count(); i++)
19+
for (int i = 0; i < bCount; i++)
1920
if (!span[i].Equals(value[i]))
2021
return false;
2122

‎src/MiniExcel/WriteAdapter/EnumerableWriteAdapter.cs

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,16 @@ public List<ExcelColumnInfo> GetColumns()
4545
_enumerator = _values.GetEnumerator();
4646
if (!_enumerator.MoveNext())
4747
{
48-
_empty = true;
49-
return null;
48+
try
49+
{
50+
_empty = true;
51+
return null;
52+
}
53+
finally
54+
{
55+
(_enumerator as IDisposable)?.Dispose();
56+
_enumerator = null;
57+
}
5058
}
5159
return CustomPropertyHelper.GetColumnInfoFromValue(_enumerator.Current, _configuration);
5260
}
@@ -58,20 +66,28 @@ public IEnumerable<IEnumerable<CellWriteInfo>> GetRows(List<ExcelColumnInfo> pro
5866
yield break;
5967
}
6068

61-
if (_enumerator is null)
69+
try
6270
{
63-
_enumerator = _values.GetEnumerator();
64-
if (!_enumerator.MoveNext())
71+
if (_enumerator is null)
6572
{
66-
yield break;
73+
_enumerator = _values.GetEnumerator();
74+
if (!_enumerator.MoveNext())
75+
{
76+
yield break;
77+
}
6778
}
68-
}
6979

70-
do
80+
do
81+
{
82+
cancellationToken.ThrowIfCancellationRequested();
83+
yield return GetRowValues(_enumerator.Current, props);
84+
} while (_enumerator.MoveNext());
85+
}
86+
finally
7187
{
72-
cancellationToken.ThrowIfCancellationRequested();
73-
yield return GetRowValues(_enumerator.Current, props);
74-
} while (_enumerator.MoveNext());
88+
(_enumerator as IDisposable)?.Dispose();
89+
_enumerator = null;
90+
}
7591
}
7692

7793

0 commit comments

Comments
 (0)