Skip to content

Remove unnecessary array allocations for Split etc #1549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tonyqus merged 1 commit into from
May 17, 2025
Merged

Remove unnecessary array allocations for Split etc #1549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@
<NoWarn>$(NoWarn);CA1834</NoWarn> <!-- Member XXX is explicitly initialized to its default value -->
<NoWarn>$(NoWarn);CA1845</NoWarn> <!-- Use span-based 'string.Concat' and 'AsSpan' instead of 'Substring' -->
<NoWarn>$(NoWarn);CA1850</NoWarn> <!-- Prefer static 'System.Security.Cryptography.MD5.HashData' method over 'ComputeHash' -->
<NoWarn>$(NoWarn);CA1861</NoWarn> <!-- Prefer 'static readonly' fields over constant array arguments -->
<NoWarn>$(NoWarn);CA1862</NoWarn> <!-- Prefer the string comparison method overload -->
<NoWarn>$(NoWarn);CA1872</NoWarn> <!-- Prefer 'System.Convert.ToHexString(byte[])' over call chains based on 'System.BitConverter.ToString(byte[])' -->
<NoWarn>$(NoWarn);CA2019</NoWarn> <!-- 'ThreadStatic' fields should not use inline initialization -->
Expand Down
10 changes: 5 additions & 5 deletions main/POIFS/Crypt/DataSpaceMapUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ public class DataSpaceMapUtils
public static void AddDefaultDataSpace(DirectoryEntry dir)
{
DataSpaceMapEntry dsme = new DataSpaceMapEntry(
new int[] { 0 }
, new String[] { Decryptor.DEFAULT_POIFS_ENTRY }
, "StrongEncryptionDataSpace"
[0]
, [Decryptor.DEFAULT_POIFS_ENTRY]
, "StrongEncryptionDataSpace"
);
DataSpaceMap dsm = new DataSpaceMap(new DataSpaceMapEntry[] { dsme });
DataSpaceMap dsm = new DataSpaceMap([dsme]);
CreateEncryptionEntry(dir, "\u0006DataSpaces/DataSpaceMap", dsm);

DataSpaceDefInition dsd = new DataSpaceDefInition(new String[] { "StrongEncryptionTransform" });
DataSpaceDefInition dsd = new DataSpaceDefInition(["StrongEncryptionTransform"]);
CreateEncryptionEntry(dir, "\u0006DataSpaces/DataSpaceInfo/StrongEncryptionDataSpace", dsd);

TransformInfoHeader tih = new TransformInfoHeader(
Expand Down
2 changes: 1 addition & 1 deletion main/POIFS/FileSystem/NPOIFSDocument.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public NPOIFSDocument(String name, int size, NPOIFSFileSystem filesystem, POIFSW

Stream innerOs = _stream.GetOutputStream();
DocumentOutputStream os = new DocumentOutputStream(innerOs, size);
POIFSDocumentPath path = new POIFSDocumentPath(name.Split(new string[] { "\\\\" }, StringSplitOptions.RemoveEmptyEntries));
POIFSDocumentPath path = new POIFSDocumentPath(name.Split([@"\\"], StringSplitOptions.RemoveEmptyEntries));
String docName = path.GetComponent(path.Length - 1);
POIFSWriterEvent event1 = new POIFSWriterEvent(os, path, docName, size);
Writer.ProcessPOIFSWriterEvent(event1);
Expand Down
8 changes: 4 additions & 4 deletions ooxml/XSSF/Extractor/XSSFExportToXml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ private static void mapCellOnNode(XSSFCell cell, XmlNode node)

private static String RemoveNamespace(String elementName)
{
return Regex.IsMatch(elementName,".*:.*") ? elementName.Split(new char[]{':'})[1] : elementName;
return Regex.IsMatch(elementName,".*:.*") ? elementName.Split(':')[1] : elementName;
}

private static String GetFormattedDate(XSSFCell cell)
Expand All @@ -342,7 +342,7 @@ private static String GetFormattedDate(XSSFCell cell)

private XmlNode GetNodeByXPath(String xpath, XmlNode rootNode, XmlDocument doc, bool CreateMultipleInstances)
{
String[] xpathTokens = xpath.Split(new char[]{'/'});
String[] xpathTokens = xpath.Split('/');


XmlNode currentNode = rootNode;
Expand Down Expand Up @@ -451,8 +451,8 @@ public int Compare(String leftXpath, String rightXpath)
doc.LoadXml(xmlSchema);


String[] leftTokens = leftXpath.Split(new char[]{'/'});
String[] rightTokens = rightXpath.Split(new char[] { '/' });
String[] leftTokens = leftXpath.Split('/');
String[] rightTokens = rightXpath.Split('/');

int minLength = leftTokens.Length < rightTokens.Length ? leftTokens.Length : rightTokens.Length;

Expand Down
2 changes: 1 addition & 1 deletion ooxml/XSSF/UserModel/Helpers/XSSFRowColShifter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ public static void UpdateConditionalFormatting(ISheet sheet, FormulaShifter Shif
{
CT_ConditionalFormatting cf = conditionalFormattingArray[j];
List<CellRangeAddress> cellRanges = new List<CellRangeAddress>();
string[] regions = cf.sqref.ToString().Split(new char[] { ' ' });
string[] regions = cf.sqref.Split(' ');

for (int i = 0; i < regions.Length; i++)
{
Expand Down
4 changes: 2 additions & 2 deletions ooxml/XSSF/UserModel/Helpers/XSSFXmlColumnPr.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ public String LocalXPath
get
{
using var localXPath = ZString.CreateStringBuilder();
int numberOfCommonXPathAxis = table.GetCommonXpath().Split(new char[] { '/' }).Length - 1;
int numberOfCommonXPathAxis = table.GetCommonXpath().Split('/').Length - 1;

String[] xPathTokens = ctXmlColumnPr.xpath.Split(new char[] { '/' });
String[] xPathTokens = ctXmlColumnPr.xpath.Split('/');
for (int i = numberOfCommonXPathAxis; i < xPathTokens.Length; i++)
{
localXPath.Append("/" + xPathTokens[i]);
Expand Down
2 changes: 1 addition & 1 deletion ooxml/XSSF/UserModel/XSSFConditionalFormatting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ internal CT_ConditionalFormatting GetCTConditionalFormatting()
public CellRangeAddress[] GetFormattingRanges()
{
List<CellRangeAddress> lst = new List<CellRangeAddress>();
String[] regions = _cf.sqref.Split(new char[] { ' ' });
String[] regions = _cf.sqref.Split(' ');
for (int i = 0; i < regions.Length; i++)
{
lst.Add(CellRangeAddress.ValueOf(regions[i]));
Expand Down
4 changes: 2 additions & 2 deletions ooxml/XSSF/UserModel/XSSFSheet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3617,15 +3617,15 @@ public List<IDataValidation> GetDataValidations()
{
CellRangeAddressList addressList = new CellRangeAddressList();

string[] regions = ctDataValidation.sqref.Split(new char[] { ' ' });
string[] regions = ctDataValidation.sqref.Split(' ');
for(int i = 0; i < regions.Length; i++)
{
if(regions[i].Length == 0)
{
continue;
}

string[] parts = regions[i].Split(new char[] { ':' });
string[] parts = regions[i].Split(':');
CellReference begin = new CellReference(parts[0]);
CellReference end = parts.Length > 1
? new CellReference(parts[1])
Expand Down
4 changes: 2 additions & 2 deletions ooxml/XSSF/UserModel/XSSFTable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public String GetCommonXpath()
if (column.GetXmlColumnPr() != null)
{
String xpath = column.GetXmlColumnPr().XPath;
String[] tokens = xpath.Split(new char[] { '/' });
String[] tokens = xpath.Split('/');
if (commonTokens==null)
{
commonTokens = tokens;
Expand Down Expand Up @@ -532,7 +532,7 @@ private void SetCellReferences()
{
string ref1 = ctTable.@ref;
if (ref1 != null) {
string[] boundaries = ref1.Split(new char[] { ':' }, 2);
string[] boundaries = ref1.Split([':'], 2);
string from = boundaries[0];
string to = boundaries.Length == 2 ? boundaries[1] : boundaries[0];
startCellReference = new CellReference(from);
Expand Down
12 changes: 7 additions & 5 deletions openxml4Net/OPC/PackagingUriHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,8 @@ public static String Combine(String prefix, String suffix)
public static Uri RelativizeUri(Uri sourceURI, Uri targetURI, bool msCompatible)
{
StringBuilder retVal = new StringBuilder();
String[] segmentsSource = sourceURI.ToString().Split(new char[] { '/' });
String[] segmentsTarget = targetURI.ToString().Split(new char[] { '/' });
String[] segmentsSource = sourceURI.ToString().Split('/');
String[] segmentsTarget = targetURI.ToString().Split('/');

// If the source Uri is empty
if (segmentsSource.Length == 0)
Expand Down Expand Up @@ -481,7 +481,7 @@ public static Uri ResolvePartUri(Uri sourcePartUri, Uri targetUri)
}
else if (targetPath.StartsWith("../"))
{
string[] segments = path.Split(new char[] { '/' });
string[] segments = path.Split('/');

int segmentEnd = segments.Length - 1;
while (targetPath.StartsWith("../"))
Expand All @@ -493,8 +493,10 @@ public static Uri ResolvePartUri(Uri sourcePartUri, Uri targetUri)

for (int i = 0; i <= segmentEnd;i++ )
{
if(segments[i]!=string.Empty)
path += segments[i]+"/";
if(segments[i] != string.Empty)
{
path += segments[i]+"/";
}
}
path += targetPath;
}
Expand Down
75 changes: 30 additions & 45 deletions testcases/main/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,33 @@
<?xml version="1.0"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="TestCases.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<appSettings>
<!-- Default POILogger class defined in the assembly
if it is not set, NPOI.Util.NullLogger will be used
-->
<add key="loggername" value="TestCases.Util.DummyPOILogger,NPOI.TestCases"/>
<add key="HSSF.testdata.path" value="..\..\..\TestCases\test-data\hssf"/>
<add key="POIFS.testdata.path" value="..\..\..\TestCases\test-data\poifs"/>
<add key="POI.testdata.path" value="..\..\..\TestCases\test-data"/>
<add key="java.io.tmpdir" value="..\..\..\TestCases\test-data\"/>
<add key="poi.keep.tmp.files" value="..\..\..\TestCases\test-data\"/>
<add key="escher.data.path" value="..\..\..\TestCases\test-data\ddf\"/>

</appSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup><userSettings>
<TestCases.Properties.Settings>
<setting name="TEST_PROPERTY" serializeAs="String">
<value>..\..\..\test-data</value>
</setting>
</TestCases.Properties.Settings>
</userSettings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="5.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="4.1.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
<configSections>
<sectionGroup name="userSettings"
type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="TestCases.Properties.Settings"
type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<appSettings>
<!-- Default POILogger class defined in the assembly
if it is not set, NPOI.Util.NullLogger will be used
-->
<add key="loggername" value="TestCases.Util.DummyPOILogger,NPOI.TestCases" />
<add key="HSSF.testdata.path" value="..\..\..\TestCases\test-data\hssf" />
<add key="POIFS.testdata.path" value="..\..\..\TestCases\test-data\poifs" />
<add key="POI.testdata.path" value="..\..\..\TestCases\test-data" />
<add key="java.io.tmpdir" value="..\..\..\TestCases\test-data\" />
<add key="poi.keep.tmp.files" value="..\..\..\TestCases\test-data\" />
<add key="escher.data.path" value="..\..\..\TestCases\test-data\ddf\" />

</appSettings>

<userSettings>
<TestCases.Properties.Settings>
<setting name="TEST_PROPERTY" serializeAs="String">
<value>..\..\..\test-data</value>
</setting>
</TestCases.Properties.Settings>
</userSettings>

</configuration>
21 changes: 0 additions & 21 deletions testcases/ooxml/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,4 @@
</setting>
</ooxml.Testcases.Properties.Settings>
</userSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="5.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="4.1.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
21 changes: 0 additions & 21 deletions testcases/openxml4net/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,4 @@
<appSettings>
<add key="POI.testdata.path" value="..\..\..\..\test-data"/>
</appSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="5.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="4.1.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Loading