jashook
diff --git a/‎Benchmark.NetCore/LabelSequenceBenchmarks.cs
Copy file name to clipboard
+17Lines changed: 17 additions & 0 deletions b/‎Benchmark.NetCore/LabelSequenceBenchmarks.cs
Copy file name to clipboard
+17Lines changed: 17 additions & 0 deletions
diff --git a/‎Benchmark.NetCore/StringSequenceBenchmarks.cs
Copy file name to clipboard
+16Lines changed: 16 additions & 0 deletions b/‎Benchmark.NetCore/StringSequenceBenchmarks.cs
Copy file name to clipboard
+16Lines changed: 16 additions & 0 deletions
diff --git a/‎Prometheus/StringSequence.cs
Copy file name to clipboardExpand all lines: Prometheus/StringSequence.cs
+10-8Lines changed: 10 additions & 8 deletions b/‎Prometheus/StringSequence.cs
Copy file name to clipboardExpand all lines: Prometheus/StringSequence.cs
+10-8Lines changed: 10 additions & 8 deletions
@@ -0,0 +1,17 @@
+using BenchmarkDotNet.Attributes;
+using Prometheus;
+
+namespace Benchmark.NetCore;
+
+[MemoryDiagnoser]
+public class LabelSequenceBenchmarks
+{
+    private static readonly StringSequence Names3Array = StringSequence.From(new[] { "aaaaaaaaaaaaaaaaa", "bbbbbbbbbbbbbb", "cccccccccccccc" });
+    private static readonly StringSequence Values3Array = StringSequence.From(new[] { "valueaaaaaaaaaaaaaaaaa", "valuebbbbbbbbbbbbbb", "valuecccccccccccccc" });
+
+    [Benchmark]
+    public void Create_From3Array()
+    {
+        LabelSequence.From(Names3Array, Values3Array);
+    }
+}
@@ -0,0 +1,16 @@
+using BenchmarkDotNet.Attributes;
+using Prometheus;
+
+namespace Benchmark.NetCore;
+
+[MemoryDiagnoser]
+public class StringSequenceBenchmarks
+{
+    private static readonly string[] Values3Array = ["aaaaaaaaaaaaaaaaa", "bbbbbbbbbbbbbb", "cccccccccccccc"];
+
+    [Benchmark]
+    public void Create_From3Array()
+    {
+        StringSequence.From(Values3Array);
+    }
+}
@@ -18,7 +18,7 @@ namespace Prometheus;
 
     public Enumerator GetEnumerator()
     {
-        return new Enumerator(_values.Span, _inheritedValues ?? []);
+        return new Enumerator(_values.Span, _inheritedValueArrays ?? []);
     }
 
     public ref struct Enumerator
@@ -152,7 +152,9 @@ private StringSequence(StringSequence inheritFrom, StringSequence thenFrom, Read
         }
 
         _values = andFinallyPrepend;
-        _inheritedValues = InheritFrom(inheritFrom, thenFrom);
+
+        if (!inheritFrom.IsEmpty || !thenFrom.IsEmpty)
+            _inheritedValueArrays = InheritFrom(inheritFrom, thenFrom);
 
         Length = _values.Length + inheritFrom.Length + thenFrom.Length;
 
@@ -167,7 +169,7 @@ public static StringSequence From(params string[] values)
         return new StringSequence(Empty, Empty, values);
     }
 
-    public static StringSequence From(ReadOnlyMemory<string> values)
+    public static StringSequence From(in ReadOnlyMemory<string> values)
     {
         if (values.Length == 0)
             return Empty;
@@ -198,7 +200,7 @@ public StringSequence Concat(StringSequence concatenatedValues)
 
     // Inherited values from one or more parent instances.
     // It may be null because structs have a default ctor that zero-initializes them, so watch out.
-    private readonly ReadOnlyMemory<string>[]? _inheritedValues;
+    private readonly ReadOnlyMemory<string>[]? _inheritedValueArrays;
 
     private readonly int _hashCode;
 
@@ -215,13 +217,13 @@ public StringSequence Concat(StringSequence concatenatedValues)
         if (!first.IsEmpty)
         {
             firstOwnArrayCount = first._values.Length > 0 ? 1 : 0;
-            firstInheritedArrayCount = first._inheritedValues?.Length ?? 0;
+            firstInheritedArrayCount = first._inheritedValueArrays?.Length ?? 0;
         }
 
         if (!second.IsEmpty)
         {
             secondOwnArrayCount = second._values.Length > 0 ? 1 : 0;
-            secondInheritedArrayCount = second._inheritedValues?.Length ?? 0;
+            secondInheritedArrayCount = second._inheritedValueArrays?.Length ?? 0;
         }
 
         var totalSegmentCount = firstOwnArrayCount + firstInheritedArrayCount + secondOwnArrayCount + secondInheritedArrayCount;
@@ -240,7 +242,7 @@ public StringSequence Concat(StringSequence concatenatedValues)
 
         if (secondInheritedArrayCount != 0)
         {
-            Array.Copy(second._inheritedValues!, 0, result, targetIndex, secondInheritedArrayCount);
+            Array.Copy(second._inheritedValueArrays!, 0, result, targetIndex, secondInheritedArrayCount);
             targetIndex += secondInheritedArrayCount;
         }
 
@@ -251,7 +253,7 @@ public StringSequence Concat(StringSequence concatenatedValues)
 
         if (firstInheritedArrayCount != 0)
         {
-            Array.Copy(first._inheritedValues!, 0, result, targetIndex, firstInheritedArrayCount);
+            Array.Copy(first._inheritedValueArrays!, 0, result, targetIndex, firstInheritedArrayCount);
             targetIndex += firstInheritedArrayCount;
         }
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ namespace Prometheus;`
`18`	`18`
`19`	`19`	`public Enumerator GetEnumerator()`
`20`	`20`	`{`
`21`		`- return new Enumerator(_values.Span, _inheritedValues ?? []);`
	`21`	`+ return new Enumerator(_values.Span, _inheritedValueArrays ?? []);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public ref struct Enumerator`
`@@ -152,7 +152,9 @@ private StringSequence(StringSequence inheritFrom, StringSequence thenFrom, Read`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`_values = andFinallyPrepend;`
`155`		`- _inheritedValues = InheritFrom(inheritFrom, thenFrom);`
	`155`	`+`
	`156`	`+ if (!inheritFrom.IsEmpty \|\| !thenFrom.IsEmpty)`
	`157`	`+ _inheritedValueArrays = InheritFrom(inheritFrom, thenFrom);`
`156`	`158`
`157`	`159`	`Length = _values.Length + inheritFrom.Length + thenFrom.Length;`
`158`	`160`
`@@ -167,7 +169,7 @@ public static StringSequence From(params string[] values)`
`167`	`169`	`return new StringSequence(Empty, Empty, values);`
`168`	`170`	`}`
`169`	`171`
`170`		`- public static StringSequence From(ReadOnlyMemory<string> values)`
	`172`	`+ public static StringSequence From(in ReadOnlyMemory<string> values)`
`171`	`173`	`{`
`172`	`174`	`if (values.Length == 0)`
`173`	`175`	`return Empty;`
`@@ -198,7 +200,7 @@ public StringSequence Concat(StringSequence concatenatedValues)`
`198`	`200`
`199`	`201`	`// Inherited values from one or more parent instances.`
`200`	`202`	`// It may be null because structs have a default ctor that zero-initializes them, so watch out.`
`201`		`- private readonly ReadOnlyMemory<string>[]? _inheritedValues;`
	`203`	`+ private readonly ReadOnlyMemory<string>[]? _inheritedValueArrays;`
`202`	`204`
`203`	`205`	`private readonly int _hashCode;`
`204`	`206`
`@@ -215,13 +217,13 @@ public StringSequence Concat(StringSequence concatenatedValues)`
`215`	`217`	`if (!first.IsEmpty)`
`216`	`218`	`{`
`217`	`219`	`firstOwnArrayCount = first._values.Length > 0 ? 1 : 0;`
`218`		`- firstInheritedArrayCount = first._inheritedValues?.Length ?? 0;`
	`220`	`+ firstInheritedArrayCount = first._inheritedValueArrays?.Length ?? 0;`
`219`	`221`	`}`
`220`	`222`
`221`	`223`	`if (!second.IsEmpty)`
`222`	`224`	`{`
`223`	`225`	`secondOwnArrayCount = second._values.Length > 0 ? 1 : 0;`
`224`		`- secondInheritedArrayCount = second._inheritedValues?.Length ?? 0;`
	`226`	`+ secondInheritedArrayCount = second._inheritedValueArrays?.Length ?? 0;`
`225`	`227`	`}`
`226`	`228`
`227`	`229`	`var totalSegmentCount = firstOwnArrayCount + firstInheritedArrayCount + secondOwnArrayCount + secondInheritedArrayCount;`
`@@ -240,7 +242,7 @@ public StringSequence Concat(StringSequence concatenatedValues)`
`240`	`242`
`241`	`243`	`if (secondInheritedArrayCount != 0)`
`242`	`244`	`{`
`243`		`- Array.Copy(second._inheritedValues!, 0, result, targetIndex, secondInheritedArrayCount);`
	`245`	`+ Array.Copy(second._inheritedValueArrays!, 0, result, targetIndex, secondInheritedArrayCount);`
`244`	`246`	`targetIndex += secondInheritedArrayCount;`
`245`	`247`	`}`
`246`	`248`
`@@ -251,7 +253,7 @@ public StringSequence Concat(StringSequence concatenatedValues)`
`251`	`253`
`252`	`254`	`if (firstInheritedArrayCount != 0)`
`253`	`255`	`{`
`254`		`- Array.Copy(first._inheritedValues!, 0, result, targetIndex, firstInheritedArrayCount);`
	`256`	`+ Array.Copy(first._inheritedValueArrays!, 0, result, targetIndex, firstInheritedArrayCount);`
`255`	`257`	`targetIndex += firstInheritedArrayCount;`
`256`	`258`	`}`
`257`	`259`