Skip to content

[8.19] Avoid HasFlag in hot-path when targeting netfx (#8779) #8780

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
merged 1 commit into from
Nov 24, 2025
+48 −0
Merged

[8.19] Avoid HasFlag in hot-path when targeting netfx (#8779) #8780

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
24 changes: 24 additions & 0 deletions src/Elastic.Clients.Elasticsearch/_Shared/Next/DoubleWithFractionalPortionConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,13 @@ public override double Read(ref Utf8JsonReader reader, Type typeToConvert, JsonS
return reader.GetDouble();
}

#if !NETFRAMEWORK
if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowNamedFloatingPointLiterals))
#else
// Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
if (((int)options.NumberHandling & (int)JsonNumberHandling.AllowNamedFloatingPointLiterals) ==
(int)JsonNumberHandling.AllowNamedFloatingPointLiterals)
#endif
{
if (reader.ValueTextEquals(NaN))
{
Expand All @@ -57,7 +63,13 @@ public override double Read(ref Utf8JsonReader reader, Type typeToConvert, JsonS
}
}

#if !NETFRAMEWORK
if (!options.NumberHandling.HasFlag(JsonNumberHandling.AllowReadingFromString))
#else
// Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
if (((int)options.NumberHandling & (int)JsonNumberHandling.AllowReadingFromString) !=
(int)JsonNumberHandling.AllowReadingFromString)
#endif
{
return reader.GetDouble();
}
Expand All @@ -71,7 +83,13 @@ public override double Read(ref Utf8JsonReader reader, Type typeToConvert, JsonS

public override void Write(Utf8JsonWriter writer, double value, JsonSerializerOptions options)
{
#if !NETFRAMEWORK
if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowNamedFloatingPointLiterals))
#else
// Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
if (((int)options.NumberHandling & (int)JsonNumberHandling.AllowNamedFloatingPointLiterals) ==
(int)JsonNumberHandling.AllowNamedFloatingPointLiterals)
#endif
{
if (double.IsNaN(value))
{
Expand All @@ -92,7 +110,13 @@ public override void Write(Utf8JsonWriter writer, double value, JsonSerializerOp
}
}

#if !NETFRAMEWORK
if (options.NumberHandling.HasFlag(JsonNumberHandling.WriteAsString))
#else
// Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
if (((int)options.NumberHandling & (int)JsonNumberHandling.WriteAsString) ==
(int)JsonNumberHandling.WriteAsString)
#endif
{
throw new NotImplementedException("'JsonNumberHandling.WriteAsString' is currently not supported.");
}
Expand Down
24 changes: 24 additions & 0 deletions src/Elastic.Clients.Elasticsearch/_Shared/Next/SingleWithFractionalPortionConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,13 @@ public override float Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSe
return reader.GetSingle();
}

#if !NETFRAMEWORK
if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowNamedFloatingPointLiterals))
#else
// Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
if (((int)options.NumberHandling & (int)JsonNumberHandling.AllowNamedFloatingPointLiterals) ==
(int)JsonNumberHandling.AllowNamedFloatingPointLiterals)
#endif
{
if (reader.ValueTextEquals(NaN))
{
Expand All @@ -57,7 +63,13 @@ public override float Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSe
}
}

#if !NETFRAMEWORK
if (!options.NumberHandling.HasFlag(JsonNumberHandling.AllowReadingFromString))
#else
// Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
if (((int)options.NumberHandling & (int)JsonNumberHandling.AllowReadingFromString) !=
(int)JsonNumberHandling.AllowReadingFromString)
#endif
{
return reader.GetSingle();
}
Expand All @@ -71,7 +83,13 @@ public override float Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSe

public override void Write(Utf8JsonWriter writer, float value, JsonSerializerOptions options)
{
#if !NETFRAMEWORK
if (options.NumberHandling.HasFlag(JsonNumberHandling.AllowNamedFloatingPointLiterals))
#else
// Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
if (((int)options.NumberHandling & (int)JsonNumberHandling.AllowNamedFloatingPointLiterals) ==
(int)JsonNumberHandling.AllowNamedFloatingPointLiterals)
#endif
{
if (float.IsNaN(value))
{
Expand All @@ -92,7 +110,13 @@ public override void Write(Utf8JsonWriter writer, float value, JsonSerializerOpt
}
}

#if !NETFRAMEWORK
if (options.NumberHandling.HasFlag(JsonNumberHandling.WriteAsString))
#else
// Optimize hot-path for performance since `HasFlag` causes boxing on .NET Framework.
if (((int)options.NumberHandling & (int)JsonNumberHandling.WriteAsString) ==
(int)JsonNumberHandling.WriteAsString)
#endif
{
throw new NotImplementedException("'JsonNumberHandling.WriteAsString' is currently not supported.");
}
Expand Down