Skip to content

Remove most of string.Trim() usages in System.Private.Xml solution. - #75452

Merged
krwq merged 5 commits into
dotnet:mainfrom
TrayanZapryanov:xmlconvert_reduce_trimstring_usage
Sep 26, 2022
Merged

Remove most of string.Trim() usages in System.Private.Xml solution.#75452
krwq merged 5 commits into
dotnet:mainfrom
TrayanZapryanov:xmlconvert_reduce_trimstring_usage

Conversation

@TrayanZapryanov

@TrayanZapryanovTrayanZapryanov commented Sep 12, 2022

Copy link
Copy Markdown
Contributor

Remove most of string.Trim() usages in System.Private.Xml solution.
They are replaced with string.AsSpan().Trim(XmlConvert.WhitespaceChars).
If string really contains a space - this will reduce one string allocation.

Several one left, but it is hard to be replaced as code around them expects string and there is no ReadOnlySpan overload.

@ghostghost added area-System.Xml community-contribution Indicates that the PR has been added by a community member labels Sep 12, 2022
@ghost

ghost commented Sep 12, 2022

Copy link
Copy Markdown

Tagging subscribers to this area: @dotnet/area-system-xml
See info in area-owners.md if you want to be subscribed.

Issue Details

Remove most of string.Trim() usages in System.Private.Xml solution.
They are replaced with string.AsSpan().Trim(XmlConvert.WhitespaceChars).
If string really contains a space - this will reduce one string allocation.

Several one left, but it is hard to be replaced as code around them expects string and there is no ReadOnlySpan overload.

Author:TrayanZapryanov
Assignees:-
Labels:

area-System.Xml

Milestone:-

eiriktsarpalis
eiriktsarpalis reviewed Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs Outdated
eiriktsarpalis
eiriktsarpalis reviewed Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs Outdated
eiriktsarpalis
eiriktsarpalis reviewed Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs Outdated
eiriktsarpalis
eiriktsarpalis reviewed Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
eiriktsarpalis
eiriktsarpalis approved these changes Sep 12, 2022
View reviewed changes

@eiriktsarpaliseiriktsarpalis left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM superficially, although @krwq might want to take a look as well since he's more familiar with the codebase.

krwq
krwq reviewed Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/Schema/XmlValueConverter.cs
krwq
krwq reviewed Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/Serialization/Xmlcustomformatter.cs Outdated
krwq
krwq approved these changes Sep 13, 2022
View reviewed changes

@krwqkrwq left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@eiriktsarpalis

eiriktsarpalis commented Sep 13, 2022•
edited
Loading

Copy link
Copy Markdown
Member

There appear to be System.Xml.RW.XmlConvert.Tests failures in CI. Could they be related to this change?

@TrayanZapryanov

TrayanZapryanov commented Sep 13, 2022

Copy link
Copy Markdown
ContributorAuthor

There appear to be System.Xml.RW.XmlConvert.Tests failures in CI. Could they be related to this change?

@eiriktsarpalis Maybe related to #74488

@TrayanZapryanov

TrayanZapryanov commented Sep 14, 2022•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

@eiriktsarpalis test fail should be connected with issue that I mentioned.
Here it is the callstack of the error :

/private/tmp/helix/working/AC830960/w/B05F097F/e /private/tmp/helix/working/AC830960/w/B05F097F/e
Discovering: System.Xml.RW.XmlConvert.Tests (method display = ClassAndMethod, method display options = None)
Discovered: System.Xml.RW.XmlConvert.Tests (found 1 test case)
Starting: System.Xml.RW.XmlConvert.Tests (parallel test collections = on, max threads = 6)
Process terminated. Assertion failed.
at System.Number.TryParseNumber(Char*& str, Char* strEnd, NumberStyles styles, NumberBuffer& number, NumberFormatInfo info) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 347
at System.Number.TryStringToNumber(ReadOnlySpan`1 value, NumberStyles styles, NumberBuffer& number, NumberFormatInfo info) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 2648
at System.Number.TryParseDouble(ReadOnlySpan`1 value, NumberStyles styles, NumberFormatInfo info, Double& result) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 2443
at System.Number.ParseDouble(ReadOnlySpan`1 value, NumberStyles styles, NumberFormatInfo info) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 2390
at System.Double.Parse(ReadOnlySpan`1 s, NumberStyles style, IFormatProvider provider) in /_/src/libraries/System.Private.CoreLib/src/System/Double.cs:line 405
at System.Xml.XmlConvert.ToDouble(String s) in /_/src/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs:line 1019
at System.Xml.Tests.ToTypeTests.TestInvalid(String[] array, String type, String[] format) in /_/src/libraries/System.Private.Xml/tests/XmlConvert/ToTypeTests.cs:line 109
at System.Xml.Tests.ToTypeTests.TestInvalid(String[] array, String type) in /_/src/libraries/System.Private.Xml/tests/XmlConvert/ToTypeTests.cs:line 84
at System.Xml.Tests.ToTypeTests.ToType12() in /_/src/libraries/System.Private.Xml/tests/XmlConvert/ToTypeTests.cs:line 324
at OLEDB.Test.ModuleCore.CVariation.Execute() in /_/src/libraries/Common/tests/System/Xml/ModuleCore/cvariation.cs:line 76
at OLEDB.Test.ModuleCore.CTestCase.<>c__DisplayClass7_1.<TestCases>b__0() in /_/src/libraries/Common/tests/System/Xml/ModuleCore/ctestcase.cs:line 131
at OLEDB.Test.ModuleCore.XunitTestCase.Run() in /_/src/libraries/Common/tests/System/Xml/ModuleCore/XunitTestCase.cs:line 33
at System.Xml.Tests.XmlConvertTests.RunTests(XunitTestCase testCase) in /_/src/libraries/System.Private.Xml/tests/XmlConvert/XmlConvertTests.cs:line 15
at InvokeStub_XmlConvertTests.RunTests(Object, Object, IntPtr*)

How can I trigger tests without pushing new changes ?
Maybe it was temporary problem...
Looks like a real problem.

TrayanZapryanov
TrayanZapryanov commented Sep 14, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
krwq
krwq reviewed Sep 26, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs

public static double ToDouble(string s)
{
ArgumentNullException.ThrowIfNull(s);

@krwqkrwqSep 26, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

interestingly this currently throws NRE

@TrayanZapryanovTrayanZapryanovSep 30, 2022

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@krwq This is to mimic current behavior. Check upper comment which shows difference when using double/float.Parse(string...) and double/float.Parse(ReadOnlySpan...) and passing null.

runtime/src/libraries/System.Private.CoreLib/src/System/Single.cs

Lines 387 to 398 in b40c3a3

publicstaticfloatParse(strings,NumberStylesstyle,IFormatProvider?provider)
{
NumberFormatInfo.ValidateParseStyleFloatingPoint(style);
if(s==null)ThrowHelper.ThrowArgumentNullException(ExceptionArgument.s);
returnNumber.ParseSingle(s,style,NumberFormatInfo.GetInstance(provider));
}
publicstaticfloatParse(ReadOnlySpan<char>s,NumberStylesstyle=NumberStyles.Float|NumberStyles.AllowThousands,IFormatProvider?provider=null)
{
NumberFormatInfo.ValidateParseStyleFloatingPoint(style);
returnNumber.ParseSingle(s,style,NumberFormatInfo.GetInstance(provider));
}

@krwq
krwq merged commit b34abe1 into dotnet:mainSep 26, 2022
@krwq

krwq commented Sep 26, 2022

Copy link
Copy Markdown
Member

Thanks @TrayanZapryanov! Please file an issue on #75452 (comment) if you get a chance

@TrayanZapryanov
TrayanZapryanov deleted the xmlconvert_reduce_trimstring_usage branch September 30, 2022 10:51
@TrayanZapryanovTrayanZapryanov mentioned this pull request Sep 30, 2022
Closed
@ghostghost locked as resolved and limited conversation to collaborators Oct 30, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@krwqkrwqkrwq approved these changes
@eiriktsarpaliseiriktsarpaliseiriktsarpalis approved these changes

Assignees

No one assigned

Labels

area-System.Xmlcommunity-contributionIndicates that the PR has been added by a community member

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@TrayanZapryanov@eiriktsarpalis@krwq@Trayan-Zapryanov
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Remove most of string.Trim() usages in System.Private.Xml solution. by TrayanZapryanov · Pull Request #75452 · dotnet/runtime · GitHub
Skip to content
Remove most of string.Trim() usages in System.Private.Xml solution. - #75452
Merged
krwq merged 5 commits into
dotnet:mainfrom 
TrayanZapryanov:xmlconvert_reduce_trimstring_usage
Sep 26, 2022
Merged
Remove most of string.Trim() usages in System.Private.Xml solution.#75452
krwq merged 5 commits into
dotnet:mainfrom 
TrayanZapryanov:xmlconvert_reduce_trimstring_usage
Conversation
@TrayanZapryanov
@TrayanZapryanovTrayanZapryanov
commented
Sep 12, 2022

Copy link


Copy Markdown

Contributor
Remove most of string.Trim() usages in System.Private.Xml solution.

They are replaced with string.AsSpan().Trim(XmlConvert.WhitespaceChars).

If string really contains a space - this will reduce one string allocation.
Several one left, but it is hard to be replaced as code around them expects string and there is no ReadOnlySpan overload.
@ghostghost
added

area-System.Xml

community-contribution
Indicates that the PR has been added by a community member
labels
Sep 12, 2022
@ghost
ghost
commented
Sep 12, 2022

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/area-system-xml

See info in area-owners.md if you want to be subscribed.
Issue Details
Remove most of string.Trim() usages in System.Private.Xml solution.

They are replaced with string.AsSpan().Trim(XmlConvert.WhitespaceChars).

If string really contains a space - this will reduce one string allocation.
Several one left, but it is hard to be replaced as code around them expects string and there is no ReadOnlySpan overload.
Author:TrayanZapryanov
Assignees:-
Labels:
area-System.Xml
Milestone:-
eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
Outdated

eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
Outdated

eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
Outdated

eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
eiriktsarpalis
eiriktsarpalis
approved these changes
Sep 12, 2022
View reviewed changes
@eiriktsarpaliseiriktsarpalis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM superficially, although @krwq might want to take a look as well since he's more familiar with the codebase.
krwq
krwq
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/Schema/XmlValueConverter.cs
krwq
krwq
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/Serialization/Xmlcustomformatter.cs
Outdated

krwq
krwq
approved these changes
Sep 13, 2022
View reviewed changes
@krwqkrwq
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!
@eiriktsarpalis
eiriktsarpalis
commented
Sep 13, 2022•

edited

Loading

Copy link


Copy Markdown

Member
There appear to be System.Xml.RW.XmlConvert.Tests failures in CI. Could they be related to this change?
@TrayanZapryanov
TrayanZapryanov
commented
Sep 13, 2022

Copy link


Copy Markdown

ContributorAuthor
There appear to be System.Xml.RW.XmlConvert.Tests failures in CI. Could they be related to this change?
@eiriktsarpalis Maybe related to #74488
@TrayanZapryanov
TrayanZapryanov
commented
Sep 14, 2022•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
@eiriktsarpalis test fail should be connected with issue that I mentioned.

Here it is the callstack of the error :
/private/tmp/helix/working/AC830960/w/B05F097F/e /private/tmp/helix/working/AC830960/w/B05F097F/e
Discovering: System.Xml.RW.XmlConvert.Tests (method display = ClassAndMethod, method display options = None)
Discovered: System.Xml.RW.XmlConvert.Tests (found 1 test case)
Starting: System.Xml.RW.XmlConvert.Tests (parallel test collections = on, max threads = 6)
Process terminated. Assertion failed.
at System.Number.TryParseNumber(Char*& str, Char* strEnd, NumberStyles styles, NumberBuffer& number, NumberFormatInfo info) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 347
at System.Number.TryStringToNumber(ReadOnlySpan`1 value, NumberStyles styles, NumberBuffer& number, NumberFormatInfo info) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 2648
at System.Number.TryParseDouble(ReadOnlySpan`1 value, NumberStyles styles, NumberFormatInfo info, Double& result) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 2443
at System.Number.ParseDouble(ReadOnlySpan`1 value, NumberStyles styles, NumberFormatInfo info) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 2390
at System.Double.Parse(ReadOnlySpan`1 s, NumberStyles style, IFormatProvider provider) in /_/src/libraries/System.Private.CoreLib/src/System/Double.cs:line 405
at System.Xml.XmlConvert.ToDouble(String s) in /_/src/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs:line 1019
at System.Xml.Tests.ToTypeTests.TestInvalid(String[] array, String type, String[] format) in /_/src/libraries/System.Private.Xml/tests/XmlConvert/ToTypeTests.cs:line 109
at System.Xml.Tests.ToTypeTests.TestInvalid(String[] array, String type) in /_/src/libraries/System.Private.Xml/tests/XmlConvert/ToTypeTests.cs:line 84
at System.Xml.Tests.ToTypeTests.ToType12() in /_/src/libraries/System.Private.Xml/tests/XmlConvert/ToTypeTests.cs:line 324
at OLEDB.Test.ModuleCore.CVariation.Execute() in /_/src/libraries/Common/tests/System/Xml/ModuleCore/cvariation.cs:line 76
at OLEDB.Test.ModuleCore.CTestCase.<>c__DisplayClass7_1.<TestCases>b__0() in /_/src/libraries/Common/tests/System/Xml/ModuleCore/ctestcase.cs:line 131
at OLEDB.Test.ModuleCore.XunitTestCase.Run() in /_/src/libraries/Common/tests/System/Xml/ModuleCore/XunitTestCase.cs:line 33
at System.Xml.Tests.XmlConvertTests.RunTests(XunitTestCase testCase) in /_/src/libraries/System.Private.Xml/tests/XmlConvert/XmlConvertTests.cs:line 15
at InvokeStub_XmlConvertTests.RunTests(Object, Object, IntPtr*)

How can I trigger tests without pushing new changes ?

Maybe it was temporary problem...

Looks like a real problem.
TrayanZapryanov
TrayanZapryanov
commented
Sep 14, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
krwq
krwq
reviewed
Sep 26, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs

 public static double ToDouble(string s)
 {
 ArgumentNullException.ThrowIfNull(s);
@krwqkrwqSep 26, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

interestingly this currently throws NRE
@TrayanZapryanovTrayanZapryanovSep 30, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@krwq This is to mimic current behavior. Check upper comment which shows difference when using double/float.Parse(string...) and double/float.Parse(ReadOnlySpan...) and passing null.
runtime/src/libraries/System.Private.CoreLib/src/System/Single.cs

Lines 387 to 398
in
b40c3a3
publicstaticfloatParse(strings,NumberStylesstyle,IFormatProvider?provider)
{
NumberFormatInfo.ValidateParseStyleFloatingPoint(style);
if(s==null)ThrowHelper.ThrowArgumentNullException(ExceptionArgument.s);
returnNumber.ParseSingle(s,style,NumberFormatInfo.GetInstance(provider));
}
publicstaticfloatParse(ReadOnlySpan<char>s,NumberStylesstyle=NumberStyles.Float|NumberStyles.AllowThousands,IFormatProvider?provider=null)
{
NumberFormatInfo.ValidateParseStyleFloatingPoint(style);
returnNumber.ParseSingle(s,style,NumberFormatInfo.GetInstance(provider));
}
@krwq
krwq
merged commit b34abe1
into
dotnet:mainSep 26, 2022
@krwq
krwq
commented
Sep 26, 2022

Copy link


Copy Markdown

Member
Thanks @TrayanZapryanov! Please file an issue on #75452 (comment) if you get a chance
@TrayanZapryanov
TrayanZapryanov
deleted the

xmlconvert_reduce_trimstring_usage

branch
September 30, 2022 10:51
@TrayanZapryanovTrayanZapryanov
mentioned this pull request
Sep 30, 2022

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Oct 30, 2022
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@krwqkrwqkrwq approved these changes
@eiriktsarpaliseiriktsarpaliseiriktsarpalis approved these changes

Assignees


No one assigned


Labels

area-System.Xmlcommunity-contributionIndicates that the PR has been added by a community member

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@TrayanZapryanov@eiriktsarpalis@krwq@Trayan-Zapryanov

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Remove most of string.Trim() usages in System.Private.Xml solution. by TrayanZapryanov · Pull Request #75452 · dotnet/runtime · GitHub
Skip to content
Remove most of string.Trim() usages in System.Private.Xml solution. - #75452
Merged
krwq merged 5 commits into
dotnet:mainfrom 
TrayanZapryanov:xmlconvert_reduce_trimstring_usage
Sep 26, 2022
Merged
Remove most of string.Trim() usages in System.Private.Xml solution.#75452
krwq merged 5 commits into
dotnet:mainfrom 
TrayanZapryanov:xmlconvert_reduce_trimstring_usage
Conversation
@TrayanZapryanov
@TrayanZapryanovTrayanZapryanov
commented
Sep 12, 2022

Copy link


Copy Markdown

Contributor
Remove most of string.Trim() usages in System.Private.Xml solution.

They are replaced with string.AsSpan().Trim(XmlConvert.WhitespaceChars).

If string really contains a space - this will reduce one string allocation.
Several one left, but it is hard to be replaced as code around them expects string and there is no ReadOnlySpan overload.
@ghostghost
added

area-System.Xml

community-contribution
Indicates that the PR has been added by a community member
labels
Sep 12, 2022
@ghost
ghost
commented
Sep 12, 2022

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/area-system-xml

See info in area-owners.md if you want to be subscribed.
Issue Details
Remove most of string.Trim() usages in System.Private.Xml solution.

They are replaced with string.AsSpan().Trim(XmlConvert.WhitespaceChars).

If string really contains a space - this will reduce one string allocation.
Several one left, but it is hard to be replaced as code around them expects string and there is no ReadOnlySpan overload.
Author:TrayanZapryanov
Assignees:-
Labels:
area-System.Xml
Milestone:-
eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
Outdated

eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
Outdated

eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
Outdated

eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
eiriktsarpalis
eiriktsarpalis
approved these changes
Sep 12, 2022
View reviewed changes
@eiriktsarpaliseiriktsarpalis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM superficially, although @krwq might want to take a look as well since he's more familiar with the codebase.
krwq
krwq
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/Schema/XmlValueConverter.cs
krwq
krwq
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/Serialization/Xmlcustomformatter.cs
Outdated

krwq
krwq
approved these changes
Sep 13, 2022
View reviewed changes
@krwqkrwq
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!
@eiriktsarpalis
eiriktsarpalis
commented
Sep 13, 2022•

edited

Loading

Copy link


Copy Markdown

Member
There appear to be System.Xml.RW.XmlConvert.Tests failures in CI. Could they be related to this change?
@TrayanZapryanov
TrayanZapryanov
commented
Sep 13, 2022

Copy link


Copy Markdown

ContributorAuthor
There appear to be System.Xml.RW.XmlConvert.Tests failures in CI. Could they be related to this change?
@eiriktsarpalis Maybe related to #74488
@TrayanZapryanov
TrayanZapryanov
commented
Sep 14, 2022•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
@eiriktsarpalis test fail should be connected with issue that I mentioned.

Here it is the callstack of the error :
/private/tmp/helix/working/AC830960/w/B05F097F/e /private/tmp/helix/working/AC830960/w/B05F097F/e
Discovering: System.Xml.RW.XmlConvert.Tests (method display = ClassAndMethod, method display options = None)
Discovered: System.Xml.RW.XmlConvert.Tests (found 1 test case)
Starting: System.Xml.RW.XmlConvert.Tests (parallel test collections = on, max threads = 6)
Process terminated. Assertion failed.
at System.Number.TryParseNumber(Char*& str, Char* strEnd, NumberStyles styles, NumberBuffer& number, NumberFormatInfo info) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 347
at System.Number.TryStringToNumber(ReadOnlySpan`1 value, NumberStyles styles, NumberBuffer& number, NumberFormatInfo info) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 2648
at System.Number.TryParseDouble(ReadOnlySpan`1 value, NumberStyles styles, NumberFormatInfo info, Double& result) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 2443
at System.Number.ParseDouble(ReadOnlySpan`1 value, NumberStyles styles, NumberFormatInfo info) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 2390
at System.Double.Parse(ReadOnlySpan`1 s, NumberStyles style, IFormatProvider provider) in /_/src/libraries/System.Private.CoreLib/src/System/Double.cs:line 405
at System.Xml.XmlConvert.ToDouble(String s) in /_/src/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs:line 1019
at System.Xml.Tests.ToTypeTests.TestInvalid(String[] array, String type, String[] format) in /_/src/libraries/System.Private.Xml/tests/XmlConvert/ToTypeTests.cs:line 109
at System.Xml.Tests.ToTypeTests.TestInvalid(String[] array, String type) in /_/src/libraries/System.Private.Xml/tests/XmlConvert/ToTypeTests.cs:line 84
at System.Xml.Tests.ToTypeTests.ToType12() in /_/src/libraries/System.Private.Xml/tests/XmlConvert/ToTypeTests.cs:line 324
at OLEDB.Test.ModuleCore.CVariation.Execute() in /_/src/libraries/Common/tests/System/Xml/ModuleCore/cvariation.cs:line 76
at OLEDB.Test.ModuleCore.CTestCase.<>c__DisplayClass7_1.<TestCases>b__0() in /_/src/libraries/Common/tests/System/Xml/ModuleCore/ctestcase.cs:line 131
at OLEDB.Test.ModuleCore.XunitTestCase.Run() in /_/src/libraries/Common/tests/System/Xml/ModuleCore/XunitTestCase.cs:line 33
at System.Xml.Tests.XmlConvertTests.RunTests(XunitTestCase testCase) in /_/src/libraries/System.Private.Xml/tests/XmlConvert/XmlConvertTests.cs:line 15
at InvokeStub_XmlConvertTests.RunTests(Object, Object, IntPtr*)

How can I trigger tests without pushing new changes ?

Maybe it was temporary problem...

Looks like a real problem.
TrayanZapryanov
TrayanZapryanov
commented
Sep 14, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
krwq
krwq
reviewed
Sep 26, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs

 public static double ToDouble(string s)
 {
 ArgumentNullException.ThrowIfNull(s);
@krwqkrwqSep 26, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

interestingly this currently throws NRE
@TrayanZapryanovTrayanZapryanovSep 30, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@krwq This is to mimic current behavior. Check upper comment which shows difference when using double/float.Parse(string...) and double/float.Parse(ReadOnlySpan...) and passing null.
runtime/src/libraries/System.Private.CoreLib/src/System/Single.cs

Lines 387 to 398
in
b40c3a3
publicstaticfloatParse(strings,NumberStylesstyle,IFormatProvider?provider)
{
NumberFormatInfo.ValidateParseStyleFloatingPoint(style);
if(s==null)ThrowHelper.ThrowArgumentNullException(ExceptionArgument.s);
returnNumber.ParseSingle(s,style,NumberFormatInfo.GetInstance(provider));
}
publicstaticfloatParse(ReadOnlySpan<char>s,NumberStylesstyle=NumberStyles.Float|NumberStyles.AllowThousands,IFormatProvider?provider=null)
{
NumberFormatInfo.ValidateParseStyleFloatingPoint(style);
returnNumber.ParseSingle(s,style,NumberFormatInfo.GetInstance(provider));
}
@krwq
krwq
merged commit b34abe1
into
dotnet:mainSep 26, 2022
@krwq
krwq
commented
Sep 26, 2022

Copy link


Copy Markdown

Member
Thanks @TrayanZapryanov! Please file an issue on #75452 (comment) if you get a chance
@TrayanZapryanov
TrayanZapryanov
deleted the

xmlconvert_reduce_trimstring_usage

branch
September 30, 2022 10:51
@TrayanZapryanovTrayanZapryanov
mentioned this pull request
Sep 30, 2022

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Oct 30, 2022
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@krwqkrwqkrwq approved these changes
@eiriktsarpaliseiriktsarpaliseiriktsarpalis approved these changes

Assignees


No one assigned


Labels

area-System.Xmlcommunity-contributionIndicates that the PR has been added by a community member

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@TrayanZapryanov@eiriktsarpalis@krwq@Trayan-Zapryanov

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Remove most of string.Trim() usages in System.Private.Xml solution. by TrayanZapryanov · Pull Request #75452 · dotnet/runtime · GitHub
Skip to content
Remove most of string.Trim() usages in System.Private.Xml solution. - #75452
Merged
krwq merged 5 commits into
dotnet:mainfrom 
TrayanZapryanov:xmlconvert_reduce_trimstring_usage
Sep 26, 2022
Merged
Remove most of string.Trim() usages in System.Private.Xml solution.#75452
krwq merged 5 commits into
dotnet:mainfrom 
TrayanZapryanov:xmlconvert_reduce_trimstring_usage
Conversation
@TrayanZapryanov
@TrayanZapryanovTrayanZapryanov
commented
Sep 12, 2022

Copy link


Copy Markdown

Contributor
Remove most of string.Trim() usages in System.Private.Xml solution.

They are replaced with string.AsSpan().Trim(XmlConvert.WhitespaceChars).

If string really contains a space - this will reduce one string allocation.
Several one left, but it is hard to be replaced as code around them expects string and there is no ReadOnlySpan overload.
@ghostghost
added

area-System.Xml

community-contribution
Indicates that the PR has been added by a community member
labels
Sep 12, 2022
@ghost
ghost
commented
Sep 12, 2022

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/area-system-xml

See info in area-owners.md if you want to be subscribed.
Issue Details
Remove most of string.Trim() usages in System.Private.Xml solution.

They are replaced with string.AsSpan().Trim(XmlConvert.WhitespaceChars).

If string really contains a space - this will reduce one string allocation.
Several one left, but it is hard to be replaced as code around them expects string and there is no ReadOnlySpan overload.
Author:TrayanZapryanov
Assignees:-
Labels:
area-System.Xml
Milestone:-
eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
Outdated

eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
Outdated

eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
Outdated

eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
eiriktsarpalis
eiriktsarpalis
approved these changes
Sep 12, 2022
View reviewed changes
@eiriktsarpaliseiriktsarpalis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM superficially, although @krwq might want to take a look as well since he's more familiar with the codebase.
krwq
krwq
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/Schema/XmlValueConverter.cs
krwq
krwq
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/Serialization/Xmlcustomformatter.cs
Outdated

krwq
krwq
approved these changes
Sep 13, 2022
View reviewed changes
@krwqkrwq
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!
@eiriktsarpalis
eiriktsarpalis
commented
Sep 13, 2022•

edited

Loading

Copy link


Copy Markdown

Member
There appear to be System.Xml.RW.XmlConvert.Tests failures in CI. Could they be related to this change?
@TrayanZapryanov
TrayanZapryanov
commented
Sep 13, 2022

Copy link


Copy Markdown

ContributorAuthor
There appear to be System.Xml.RW.XmlConvert.Tests failures in CI. Could they be related to this change?
@eiriktsarpalis Maybe related to #74488
@TrayanZapryanov
TrayanZapryanov
commented
Sep 14, 2022•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
@eiriktsarpalis test fail should be connected with issue that I mentioned.

Here it is the callstack of the error :
/private/tmp/helix/working/AC830960/w/B05F097F/e /private/tmp/helix/working/AC830960/w/B05F097F/e
Discovering: System.Xml.RW.XmlConvert.Tests (method display = ClassAndMethod, method display options = None)
Discovered: System.Xml.RW.XmlConvert.Tests (found 1 test case)
Starting: System.Xml.RW.XmlConvert.Tests (parallel test collections = on, max threads = 6)
Process terminated. Assertion failed.
at System.Number.TryParseNumber(Char*& str, Char* strEnd, NumberStyles styles, NumberBuffer& number, NumberFormatInfo info) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 347
at System.Number.TryStringToNumber(ReadOnlySpan`1 value, NumberStyles styles, NumberBuffer& number, NumberFormatInfo info) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 2648
at System.Number.TryParseDouble(ReadOnlySpan`1 value, NumberStyles styles, NumberFormatInfo info, Double& result) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 2443
at System.Number.ParseDouble(ReadOnlySpan`1 value, NumberStyles styles, NumberFormatInfo info) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 2390
at System.Double.Parse(ReadOnlySpan`1 s, NumberStyles style, IFormatProvider provider) in /_/src/libraries/System.Private.CoreLib/src/System/Double.cs:line 405
at System.Xml.XmlConvert.ToDouble(String s) in /_/src/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs:line 1019
at System.Xml.Tests.ToTypeTests.TestInvalid(String[] array, String type, String[] format) in /_/src/libraries/System.Private.Xml/tests/XmlConvert/ToTypeTests.cs:line 109
at System.Xml.Tests.ToTypeTests.TestInvalid(String[] array, String type) in /_/src/libraries/System.Private.Xml/tests/XmlConvert/ToTypeTests.cs:line 84
at System.Xml.Tests.ToTypeTests.ToType12() in /_/src/libraries/System.Private.Xml/tests/XmlConvert/ToTypeTests.cs:line 324
at OLEDB.Test.ModuleCore.CVariation.Execute() in /_/src/libraries/Common/tests/System/Xml/ModuleCore/cvariation.cs:line 76
at OLEDB.Test.ModuleCore.CTestCase.<>c__DisplayClass7_1.<TestCases>b__0() in /_/src/libraries/Common/tests/System/Xml/ModuleCore/ctestcase.cs:line 131
at OLEDB.Test.ModuleCore.XunitTestCase.Run() in /_/src/libraries/Common/tests/System/Xml/ModuleCore/XunitTestCase.cs:line 33
at System.Xml.Tests.XmlConvertTests.RunTests(XunitTestCase testCase) in /_/src/libraries/System.Private.Xml/tests/XmlConvert/XmlConvertTests.cs:line 15
at InvokeStub_XmlConvertTests.RunTests(Object, Object, IntPtr*)

How can I trigger tests without pushing new changes ?

Maybe it was temporary problem...

Looks like a real problem.
TrayanZapryanov
TrayanZapryanov
commented
Sep 14, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
krwq
krwq
reviewed
Sep 26, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs

 public static double ToDouble(string s)
 {
 ArgumentNullException.ThrowIfNull(s);
@krwqkrwqSep 26, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

interestingly this currently throws NRE
@TrayanZapryanovTrayanZapryanovSep 30, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@krwq This is to mimic current behavior. Check upper comment which shows difference when using double/float.Parse(string...) and double/float.Parse(ReadOnlySpan...) and passing null.
runtime/src/libraries/System.Private.CoreLib/src/System/Single.cs

Lines 387 to 398
in
b40c3a3
publicstaticfloatParse(strings,NumberStylesstyle,IFormatProvider?provider)
{
NumberFormatInfo.ValidateParseStyleFloatingPoint(style);
if(s==null)ThrowHelper.ThrowArgumentNullException(ExceptionArgument.s);
returnNumber.ParseSingle(s,style,NumberFormatInfo.GetInstance(provider));
}
publicstaticfloatParse(ReadOnlySpan<char>s,NumberStylesstyle=NumberStyles.Float|NumberStyles.AllowThousands,IFormatProvider?provider=null)
{
NumberFormatInfo.ValidateParseStyleFloatingPoint(style);
returnNumber.ParseSingle(s,style,NumberFormatInfo.GetInstance(provider));
}
@krwq
krwq
merged commit b34abe1
into
dotnet:mainSep 26, 2022
@krwq
krwq
commented
Sep 26, 2022

Copy link


Copy Markdown

Member
Thanks @TrayanZapryanov! Please file an issue on #75452 (comment) if you get a chance
@TrayanZapryanov
TrayanZapryanov
deleted the

xmlconvert_reduce_trimstring_usage

branch
September 30, 2022 10:51
@TrayanZapryanovTrayanZapryanov
mentioned this pull request
Sep 30, 2022

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Oct 30, 2022
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@krwqkrwqkrwq approved these changes
@eiriktsarpaliseiriktsarpaliseiriktsarpalis approved these changes

Assignees


No one assigned


Labels

area-System.Xmlcommunity-contributionIndicates that the PR has been added by a community member

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@TrayanZapryanov@eiriktsarpalis@krwq@Trayan-Zapryanov

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Remove most of string.Trim() usages in System.Private.Xml solution. by TrayanZapryanov · Pull Request #75452 · dotnet/runtime · GitHub
Skip to content
Remove most of string.Trim() usages in System.Private.Xml solution. - #75452
Merged
krwq merged 5 commits into
dotnet:mainfrom 
TrayanZapryanov:xmlconvert_reduce_trimstring_usage
Sep 26, 2022
Merged
Remove most of string.Trim() usages in System.Private.Xml solution.#75452
krwq merged 5 commits into
dotnet:mainfrom 
TrayanZapryanov:xmlconvert_reduce_trimstring_usage
Conversation
@TrayanZapryanov
@TrayanZapryanovTrayanZapryanov
commented
Sep 12, 2022

Copy link


Copy Markdown

Contributor
Remove most of string.Trim() usages in System.Private.Xml solution.

They are replaced with string.AsSpan().Trim(XmlConvert.WhitespaceChars).

If string really contains a space - this will reduce one string allocation.
Several one left, but it is hard to be replaced as code around them expects string and there is no ReadOnlySpan overload.
@ghostghost
added

area-System.Xml

community-contribution
Indicates that the PR has been added by a community member
labels
Sep 12, 2022
@ghost
ghost
commented
Sep 12, 2022

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/area-system-xml

See info in area-owners.md if you want to be subscribed.
Issue Details
Remove most of string.Trim() usages in System.Private.Xml solution.

They are replaced with string.AsSpan().Trim(XmlConvert.WhitespaceChars).

If string really contains a space - this will reduce one string allocation.
Several one left, but it is hard to be replaced as code around them expects string and there is no ReadOnlySpan overload.
Author:TrayanZapryanov
Assignees:-
Labels:
area-System.Xml
Milestone:-
eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
Outdated

eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
Outdated

eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
Outdated

eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
eiriktsarpalis
eiriktsarpalis
approved these changes
Sep 12, 2022
View reviewed changes
@eiriktsarpaliseiriktsarpalis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM superficially, although @krwq might want to take a look as well since he's more familiar with the codebase.
krwq
krwq
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/Schema/XmlValueConverter.cs
krwq
krwq
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/Serialization/Xmlcustomformatter.cs
Outdated

krwq
krwq
approved these changes
Sep 13, 2022
View reviewed changes
@krwqkrwq
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!
@eiriktsarpalis
eiriktsarpalis
commented
Sep 13, 2022•

edited

Loading

Copy link


Copy Markdown

Member
There appear to be System.Xml.RW.XmlConvert.Tests failures in CI. Could they be related to this change?
@TrayanZapryanov
TrayanZapryanov
commented
Sep 13, 2022

Copy link


Copy Markdown

ContributorAuthor
There appear to be System.Xml.RW.XmlConvert.Tests failures in CI. Could they be related to this change?
@eiriktsarpalis Maybe related to #74488
@TrayanZapryanov
TrayanZapryanov
commented
Sep 14, 2022•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
@eiriktsarpalis test fail should be connected with issue that I mentioned.

Here it is the callstack of the error :
/private/tmp/helix/working/AC830960/w/B05F097F/e /private/tmp/helix/working/AC830960/w/B05F097F/e
Discovering: System.Xml.RW.XmlConvert.Tests (method display = ClassAndMethod, method display options = None)
Discovered: System.Xml.RW.XmlConvert.Tests (found 1 test case)
Starting: System.Xml.RW.XmlConvert.Tests (parallel test collections = on, max threads = 6)
Process terminated. Assertion failed.
at System.Number.TryParseNumber(Char*& str, Char* strEnd, NumberStyles styles, NumberBuffer& number, NumberFormatInfo info) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 347
at System.Number.TryStringToNumber(ReadOnlySpan`1 value, NumberStyles styles, NumberBuffer& number, NumberFormatInfo info) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 2648
at System.Number.TryParseDouble(ReadOnlySpan`1 value, NumberStyles styles, NumberFormatInfo info, Double& result) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 2443
at System.Number.ParseDouble(ReadOnlySpan`1 value, NumberStyles styles, NumberFormatInfo info) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 2390
at System.Double.Parse(ReadOnlySpan`1 s, NumberStyles style, IFormatProvider provider) in /_/src/libraries/System.Private.CoreLib/src/System/Double.cs:line 405
at System.Xml.XmlConvert.ToDouble(String s) in /_/src/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs:line 1019
at System.Xml.Tests.ToTypeTests.TestInvalid(String[] array, String type, String[] format) in /_/src/libraries/System.Private.Xml/tests/XmlConvert/ToTypeTests.cs:line 109
at System.Xml.Tests.ToTypeTests.TestInvalid(String[] array, String type) in /_/src/libraries/System.Private.Xml/tests/XmlConvert/ToTypeTests.cs:line 84
at System.Xml.Tests.ToTypeTests.ToType12() in /_/src/libraries/System.Private.Xml/tests/XmlConvert/ToTypeTests.cs:line 324
at OLEDB.Test.ModuleCore.CVariation.Execute() in /_/src/libraries/Common/tests/System/Xml/ModuleCore/cvariation.cs:line 76
at OLEDB.Test.ModuleCore.CTestCase.<>c__DisplayClass7_1.<TestCases>b__0() in /_/src/libraries/Common/tests/System/Xml/ModuleCore/ctestcase.cs:line 131
at OLEDB.Test.ModuleCore.XunitTestCase.Run() in /_/src/libraries/Common/tests/System/Xml/ModuleCore/XunitTestCase.cs:line 33
at System.Xml.Tests.XmlConvertTests.RunTests(XunitTestCase testCase) in /_/src/libraries/System.Private.Xml/tests/XmlConvert/XmlConvertTests.cs:line 15
at InvokeStub_XmlConvertTests.RunTests(Object, Object, IntPtr*)

How can I trigger tests without pushing new changes ?

Maybe it was temporary problem...

Looks like a real problem.
TrayanZapryanov
TrayanZapryanov
commented
Sep 14, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
krwq
krwq
reviewed
Sep 26, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs

 public static double ToDouble(string s)
 {
 ArgumentNullException.ThrowIfNull(s);
@krwqkrwqSep 26, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

interestingly this currently throws NRE
@TrayanZapryanovTrayanZapryanovSep 30, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@krwq This is to mimic current behavior. Check upper comment which shows difference when using double/float.Parse(string...) and double/float.Parse(ReadOnlySpan...) and passing null.
runtime/src/libraries/System.Private.CoreLib/src/System/Single.cs

Lines 387 to 398
in
b40c3a3
publicstaticfloatParse(strings,NumberStylesstyle,IFormatProvider?provider)
{
NumberFormatInfo.ValidateParseStyleFloatingPoint(style);
if(s==null)ThrowHelper.ThrowArgumentNullException(ExceptionArgument.s);
returnNumber.ParseSingle(s,style,NumberFormatInfo.GetInstance(provider));
}
publicstaticfloatParse(ReadOnlySpan<char>s,NumberStylesstyle=NumberStyles.Float|NumberStyles.AllowThousands,IFormatProvider?provider=null)
{
NumberFormatInfo.ValidateParseStyleFloatingPoint(style);
returnNumber.ParseSingle(s,style,NumberFormatInfo.GetInstance(provider));
}
@krwq
krwq
merged commit b34abe1
into
dotnet:mainSep 26, 2022
@krwq
krwq
commented
Sep 26, 2022

Copy link


Copy Markdown

Member
Thanks @TrayanZapryanov! Please file an issue on #75452 (comment) if you get a chance
@TrayanZapryanov
TrayanZapryanov
deleted the

xmlconvert_reduce_trimstring_usage

branch
September 30, 2022 10:51
@TrayanZapryanovTrayanZapryanov
mentioned this pull request
Sep 30, 2022

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Oct 30, 2022
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@krwqkrwqkrwq approved these changes
@eiriktsarpaliseiriktsarpaliseiriktsarpalis approved these changes

Assignees


No one assigned


Labels

area-System.Xmlcommunity-contributionIndicates that the PR has been added by a community member

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@TrayanZapryanov@eiriktsarpalis@krwq@Trayan-Zapryanov

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Remove most of string.Trim() usages in System.Private.Xml solution. by TrayanZapryanov · Pull Request #75452 · dotnet/runtime · GitHub
Skip to content
Remove most of string.Trim() usages in System.Private.Xml solution. - #75452
Merged
krwq merged 5 commits into
dotnet:mainfrom 
TrayanZapryanov:xmlconvert_reduce_trimstring_usage
Sep 26, 2022
Merged
Remove most of string.Trim() usages in System.Private.Xml solution.#75452
krwq merged 5 commits into
dotnet:mainfrom 
TrayanZapryanov:xmlconvert_reduce_trimstring_usage
Conversation
@TrayanZapryanov
@TrayanZapryanovTrayanZapryanov
commented
Sep 12, 2022

Copy link


Copy Markdown

Contributor
Remove most of string.Trim() usages in System.Private.Xml solution.

They are replaced with string.AsSpan().Trim(XmlConvert.WhitespaceChars).

If string really contains a space - this will reduce one string allocation.
Several one left, but it is hard to be replaced as code around them expects string and there is no ReadOnlySpan overload.
@ghostghost
added

area-System.Xml

community-contribution
Indicates that the PR has been added by a community member
labels
Sep 12, 2022
@ghost
ghost
commented
Sep 12, 2022

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/area-system-xml

See info in area-owners.md if you want to be subscribed.
Issue Details
Remove most of string.Trim() usages in System.Private.Xml solution.

They are replaced with string.AsSpan().Trim(XmlConvert.WhitespaceChars).

If string really contains a space - this will reduce one string allocation.
Several one left, but it is hard to be replaced as code around them expects string and there is no ReadOnlySpan overload.
Author:TrayanZapryanov
Assignees:-
Labels:
area-System.Xml
Milestone:-
eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
Outdated

eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
Outdated

eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
Outdated

eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
eiriktsarpalis
eiriktsarpalis
approved these changes
Sep 12, 2022
View reviewed changes
@eiriktsarpaliseiriktsarpalis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM superficially, although @krwq might want to take a look as well since he's more familiar with the codebase.
krwq
krwq
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/Schema/XmlValueConverter.cs
krwq
krwq
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/Serialization/Xmlcustomformatter.cs
Outdated

krwq
krwq
approved these changes
Sep 13, 2022
View reviewed changes
@krwqkrwq
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!
@eiriktsarpalis
eiriktsarpalis
commented
Sep 13, 2022•

edited

Loading

Copy link


Copy Markdown

Member
There appear to be System.Xml.RW.XmlConvert.Tests failures in CI. Could they be related to this change?
@TrayanZapryanov
TrayanZapryanov
commented
Sep 13, 2022

Copy link


Copy Markdown

ContributorAuthor
There appear to be System.Xml.RW.XmlConvert.Tests failures in CI. Could they be related to this change?
@eiriktsarpalis Maybe related to #74488
@TrayanZapryanov
TrayanZapryanov
commented
Sep 14, 2022•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
@eiriktsarpalis test fail should be connected with issue that I mentioned.

Here it is the callstack of the error :
/private/tmp/helix/working/AC830960/w/B05F097F/e /private/tmp/helix/working/AC830960/w/B05F097F/e
Discovering: System.Xml.RW.XmlConvert.Tests (method display = ClassAndMethod, method display options = None)
Discovered: System.Xml.RW.XmlConvert.Tests (found 1 test case)
Starting: System.Xml.RW.XmlConvert.Tests (parallel test collections = on, max threads = 6)
Process terminated. Assertion failed.
at System.Number.TryParseNumber(Char*& str, Char* strEnd, NumberStyles styles, NumberBuffer& number, NumberFormatInfo info) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 347
at System.Number.TryStringToNumber(ReadOnlySpan`1 value, NumberStyles styles, NumberBuffer& number, NumberFormatInfo info) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 2648
at System.Number.TryParseDouble(ReadOnlySpan`1 value, NumberStyles styles, NumberFormatInfo info, Double& result) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 2443
at System.Number.ParseDouble(ReadOnlySpan`1 value, NumberStyles styles, NumberFormatInfo info) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 2390
at System.Double.Parse(ReadOnlySpan`1 s, NumberStyles style, IFormatProvider provider) in /_/src/libraries/System.Private.CoreLib/src/System/Double.cs:line 405
at System.Xml.XmlConvert.ToDouble(String s) in /_/src/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs:line 1019
at System.Xml.Tests.ToTypeTests.TestInvalid(String[] array, String type, String[] format) in /_/src/libraries/System.Private.Xml/tests/XmlConvert/ToTypeTests.cs:line 109
at System.Xml.Tests.ToTypeTests.TestInvalid(String[] array, String type) in /_/src/libraries/System.Private.Xml/tests/XmlConvert/ToTypeTests.cs:line 84
at System.Xml.Tests.ToTypeTests.ToType12() in /_/src/libraries/System.Private.Xml/tests/XmlConvert/ToTypeTests.cs:line 324
at OLEDB.Test.ModuleCore.CVariation.Execute() in /_/src/libraries/Common/tests/System/Xml/ModuleCore/cvariation.cs:line 76
at OLEDB.Test.ModuleCore.CTestCase.<>c__DisplayClass7_1.<TestCases>b__0() in /_/src/libraries/Common/tests/System/Xml/ModuleCore/ctestcase.cs:line 131
at OLEDB.Test.ModuleCore.XunitTestCase.Run() in /_/src/libraries/Common/tests/System/Xml/ModuleCore/XunitTestCase.cs:line 33
at System.Xml.Tests.XmlConvertTests.RunTests(XunitTestCase testCase) in /_/src/libraries/System.Private.Xml/tests/XmlConvert/XmlConvertTests.cs:line 15
at InvokeStub_XmlConvertTests.RunTests(Object, Object, IntPtr*)

How can I trigger tests without pushing new changes ?

Maybe it was temporary problem...

Looks like a real problem.
TrayanZapryanov
TrayanZapryanov
commented
Sep 14, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
krwq
krwq
reviewed
Sep 26, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs

 public static double ToDouble(string s)
 {
 ArgumentNullException.ThrowIfNull(s);
@krwqkrwqSep 26, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

interestingly this currently throws NRE
@TrayanZapryanovTrayanZapryanovSep 30, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@krwq This is to mimic current behavior. Check upper comment which shows difference when using double/float.Parse(string...) and double/float.Parse(ReadOnlySpan...) and passing null.
runtime/src/libraries/System.Private.CoreLib/src/System/Single.cs

Lines 387 to 398
in
b40c3a3
publicstaticfloatParse(strings,NumberStylesstyle,IFormatProvider?provider)
{
NumberFormatInfo.ValidateParseStyleFloatingPoint(style);
if(s==null)ThrowHelper.ThrowArgumentNullException(ExceptionArgument.s);
returnNumber.ParseSingle(s,style,NumberFormatInfo.GetInstance(provider));
}
publicstaticfloatParse(ReadOnlySpan<char>s,NumberStylesstyle=NumberStyles.Float|NumberStyles.AllowThousands,IFormatProvider?provider=null)
{
NumberFormatInfo.ValidateParseStyleFloatingPoint(style);
returnNumber.ParseSingle(s,style,NumberFormatInfo.GetInstance(provider));
}
@krwq
krwq
merged commit b34abe1
into
dotnet:mainSep 26, 2022
@krwq
krwq
commented
Sep 26, 2022

Copy link


Copy Markdown

Member
Thanks @TrayanZapryanov! Please file an issue on #75452 (comment) if you get a chance
@TrayanZapryanov
TrayanZapryanov
deleted the

xmlconvert_reduce_trimstring_usage

branch
September 30, 2022 10:51
@TrayanZapryanovTrayanZapryanov
mentioned this pull request
Sep 30, 2022

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Oct 30, 2022
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@krwqkrwqkrwq approved these changes
@eiriktsarpaliseiriktsarpaliseiriktsarpalis approved these changes

Assignees


No one assigned


Labels

area-System.Xmlcommunity-contributionIndicates that the PR has been added by a community member

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@TrayanZapryanov@eiriktsarpalis@krwq@Trayan-Zapryanov

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
Remove most of string.Trim() usages in System.Private.Xml solution. by TrayanZapryanov · Pull Request #75452 · dotnet/runtime · GitHub
Skip to content
Remove most of string.Trim() usages in System.Private.Xml solution. - #75452
Merged
krwq merged 5 commits into
dotnet:mainfrom 
TrayanZapryanov:xmlconvert_reduce_trimstring_usage
Sep 26, 2022
Merged
Remove most of string.Trim() usages in System.Private.Xml solution.#75452
krwq merged 5 commits into
dotnet:mainfrom 
TrayanZapryanov:xmlconvert_reduce_trimstring_usage
Conversation
@TrayanZapryanov
@TrayanZapryanovTrayanZapryanov
commented
Sep 12, 2022

Copy link


Copy Markdown

Contributor
Remove most of string.Trim() usages in System.Private.Xml solution.

They are replaced with string.AsSpan().Trim(XmlConvert.WhitespaceChars).

If string really contains a space - this will reduce one string allocation.
Several one left, but it is hard to be replaced as code around them expects string and there is no ReadOnlySpan overload.
@ghostghost
added

area-System.Xml

community-contribution
Indicates that the PR has been added by a community member
labels
Sep 12, 2022
@ghost
ghost
commented
Sep 12, 2022

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/area-system-xml

See info in area-owners.md if you want to be subscribed.
Issue Details
Remove most of string.Trim() usages in System.Private.Xml solution.

They are replaced with string.AsSpan().Trim(XmlConvert.WhitespaceChars).

If string really contains a space - this will reduce one string allocation.
Several one left, but it is hard to be replaced as code around them expects string and there is no ReadOnlySpan overload.
Author:TrayanZapryanov
Assignees:-
Labels:
area-System.Xml
Milestone:-
eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
Outdated

eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
Outdated

eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
Outdated

eiriktsarpalis
eiriktsarpalis
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
eiriktsarpalis
eiriktsarpalis
approved these changes
Sep 12, 2022
View reviewed changes
@eiriktsarpaliseiriktsarpalis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM superficially, although @krwq might want to take a look as well since he's more familiar with the codebase.
krwq
krwq
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/Schema/XmlValueConverter.cs
krwq
krwq
reviewed
Sep 12, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/Serialization/Xmlcustomformatter.cs
Outdated

krwq
krwq
approved these changes
Sep 13, 2022
View reviewed changes
@krwqkrwq
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!
@eiriktsarpalis
eiriktsarpalis
commented
Sep 13, 2022•

edited

Loading

Copy link


Copy Markdown

Member
There appear to be System.Xml.RW.XmlConvert.Tests failures in CI. Could they be related to this change?
@TrayanZapryanov
TrayanZapryanov
commented
Sep 13, 2022

Copy link


Copy Markdown

ContributorAuthor
There appear to be System.Xml.RW.XmlConvert.Tests failures in CI. Could they be related to this change?
@eiriktsarpalis Maybe related to #74488
@TrayanZapryanov
TrayanZapryanov
commented
Sep 14, 2022•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
@eiriktsarpalis test fail should be connected with issue that I mentioned.

Here it is the callstack of the error :
/private/tmp/helix/working/AC830960/w/B05F097F/e /private/tmp/helix/working/AC830960/w/B05F097F/e
Discovering: System.Xml.RW.XmlConvert.Tests (method display = ClassAndMethod, method display options = None)
Discovered: System.Xml.RW.XmlConvert.Tests (found 1 test case)
Starting: System.Xml.RW.XmlConvert.Tests (parallel test collections = on, max threads = 6)
Process terminated. Assertion failed.
at System.Number.TryParseNumber(Char*& str, Char* strEnd, NumberStyles styles, NumberBuffer& number, NumberFormatInfo info) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 347
at System.Number.TryStringToNumber(ReadOnlySpan`1 value, NumberStyles styles, NumberBuffer& number, NumberFormatInfo info) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 2648
at System.Number.TryParseDouble(ReadOnlySpan`1 value, NumberStyles styles, NumberFormatInfo info, Double& result) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 2443
at System.Number.ParseDouble(ReadOnlySpan`1 value, NumberStyles styles, NumberFormatInfo info) in /_/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs:line 2390
at System.Double.Parse(ReadOnlySpan`1 s, NumberStyles style, IFormatProvider provider) in /_/src/libraries/System.Private.CoreLib/src/System/Double.cs:line 405
at System.Xml.XmlConvert.ToDouble(String s) in /_/src/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs:line 1019
at System.Xml.Tests.ToTypeTests.TestInvalid(String[] array, String type, String[] format) in /_/src/libraries/System.Private.Xml/tests/XmlConvert/ToTypeTests.cs:line 109
at System.Xml.Tests.ToTypeTests.TestInvalid(String[] array, String type) in /_/src/libraries/System.Private.Xml/tests/XmlConvert/ToTypeTests.cs:line 84
at System.Xml.Tests.ToTypeTests.ToType12() in /_/src/libraries/System.Private.Xml/tests/XmlConvert/ToTypeTests.cs:line 324
at OLEDB.Test.ModuleCore.CVariation.Execute() in /_/src/libraries/Common/tests/System/Xml/ModuleCore/cvariation.cs:line 76
at OLEDB.Test.ModuleCore.CTestCase.<>c__DisplayClass7_1.<TestCases>b__0() in /_/src/libraries/Common/tests/System/Xml/ModuleCore/ctestcase.cs:line 131
at OLEDB.Test.ModuleCore.XunitTestCase.Run() in /_/src/libraries/Common/tests/System/Xml/ModuleCore/XunitTestCase.cs:line 33
at System.Xml.Tests.XmlConvertTests.RunTests(XunitTestCase testCase) in /_/src/libraries/System.Private.Xml/tests/XmlConvert/XmlConvertTests.cs:line 15
at InvokeStub_XmlConvertTests.RunTests(Object, Object, IntPtr*)

How can I trigger tests without pushing new changes ?

Maybe it was temporary problem...

Looks like a real problem.
TrayanZapryanov
TrayanZapryanov
commented
Sep 14, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs
krwq
krwq
reviewed
Sep 26, 2022
View reviewed changes
Comment threadsrc/libraries/System.Private.Xml/src/System/Xml/XmlConvert.cs

 public static double ToDouble(string s)
 {
 ArgumentNullException.ThrowIfNull(s);
@krwqkrwqSep 26, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

interestingly this currently throws NRE
@TrayanZapryanovTrayanZapryanovSep 30, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@krwq This is to mimic current behavior. Check upper comment which shows difference when using double/float.Parse(string...) and double/float.Parse(ReadOnlySpan...) and passing null.
runtime/src/libraries/System.Private.CoreLib/src/System/Single.cs

Lines 387 to 398
in
b40c3a3
publicstaticfloatParse(strings,NumberStylesstyle,IFormatProvider?provider)
{
NumberFormatInfo.ValidateParseStyleFloatingPoint(style);
if(s==null)ThrowHelper.ThrowArgumentNullException(ExceptionArgument.s);
returnNumber.ParseSingle(s,style,NumberFormatInfo.GetInstance(provider));
}
publicstaticfloatParse(ReadOnlySpan<char>s,NumberStylesstyle=NumberStyles.Float|NumberStyles.AllowThousands,IFormatProvider?provider=null)
{
NumberFormatInfo.ValidateParseStyleFloatingPoint(style);
returnNumber.ParseSingle(s,style,NumberFormatInfo.GetInstance(provider));
}
@krwq
krwq
merged commit b34abe1
into
dotnet:mainSep 26, 2022
@krwq
krwq
commented
Sep 26, 2022

Copy link


Copy Markdown

Member
Thanks @TrayanZapryanov! Please file an issue on #75452 (comment) if you get a chance
@TrayanZapryanov
TrayanZapryanov
deleted the

xmlconvert_reduce_trimstring_usage

branch
September 30, 2022 10:51
@TrayanZapryanovTrayanZapryanov
mentioned this pull request
Sep 30, 2022

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Oct 30, 2022
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@krwqkrwqkrwq approved these changes
@eiriktsarpaliseiriktsarpaliseiriktsarpalis approved these changes

Assignees


No one assigned


Labels

area-System.Xmlcommunity-contributionIndicates that the PR has been added by a community member

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@TrayanZapryanov@eiriktsarpalis@krwq@Trayan-Zapryanov