Remove data from contexts if it is just the same format

Genbox · Genbox · commit 3edf080f2c28 · 2025-06-09T18:40:01.000+02:00
diff --git a/Src/FastData.Generator.CPlusPlus/Internal/Generators/BinarySearchCode.cs b/Src/FastData.Generator.CPlusPlus/Internal/Generators/BinarySearchCode.cs
@@ -8,8 +8,8 @@ internal sealed class BinarySearchCode<T>(BinarySearchContext<T> ctx) : CPlusPlu
 {
     public override string Generate(ReadOnlySpan<T> data) =>
         $$"""
-              {{FieldModifier}}std::array<{{TypeName}}, {{ctx.Data.Length.ToStringInvariant()}}> entries = {
-          {{FormatColumns(ctx.Data, ToValueLabel)}}
+              {{FieldModifier}}std::array<{{TypeName}}, {{data.Length.ToStringInvariant()}}> entries = {
+          {{FormatColumns(data, ToValueLabel)}}
               };
 
           public:
@@ -19,7 +19,7 @@ public override string Generate(ReadOnlySpan<T> data) =>
           {{EarlyExits}}
 
                   {{ArraySizeType}} lo = 0;
-                  {{ArraySizeType}} hi = {{(ctx.Data.Length - 1).ToStringInvariant()}};
+                  {{ArraySizeType}} hi = {{(data.Length - 1).ToStringInvariant()}};
                   while (lo <= hi)
                   {
                       const size_t mid = lo + ((hi - lo) >> 1);
diff --git a/Src/FastData.Generator.CPlusPlus/Internal/Generators/EytzingerSearchCode.cs b/Src/FastData.Generator.CPlusPlus/Internal/Generators/EytzingerSearchCode.cs
@@ -8,8 +8,8 @@ internal sealed class EytzingerSearchCode<T>(EytzingerSearchContext<T> ctx) : CP
 {
     public override string Generate(ReadOnlySpan<T> data) =>
         $$"""
-              {{FieldModifier}}std::array<{{TypeName}}, {{ctx.Data.Length.ToStringInvariant()}}> entries = {
-          {{FormatColumns(ctx.Data, ToValueLabel)}}
+              {{FieldModifier}}std::array<{{TypeName}}, {{data.Length.ToStringInvariant()}}> entries = {
+          {{FormatColumns(data, ToValueLabel)}}
               };
 
           public:
diff --git a/Src/FastData.Generator.CSharp/Internal/Generators/BinarySearchCode.cs b/Src/FastData.Generator.CSharp/Internal/Generators/BinarySearchCode.cs
@@ -9,7 +9,7 @@ internal sealed class BinarySearchCode<T>(BinarySearchContext<T> ctx, CSharpCode
     public override string Generate(ReadOnlySpan<T> data) =>
         $$"""
               {{FieldModifier}}{{TypeName}}[] _entries = new {{TypeName}}[] {
-          {{FormatColumns(ctx.Data, ToValueLabel)}}
+          {{FormatColumns(data, ToValueLabel)}}
               };
 
               {{MethodAttribute}}
@@ -18,7 +18,7 @@ public override string Generate(ReadOnlySpan<T> data) =>
           {{EarlyExits}}
 
                   int lo = 0;
-                  int hi = {{(ctx.Data.Length - 1).ToStringInvariant()}};
+                  int hi = {{(data.Length - 1).ToStringInvariant()}};
                   while (lo <= hi)
                   {
                       int i = lo + ((hi - lo) >> 1);
diff --git a/Src/FastData.Generator.CSharp/Internal/Generators/EytzingerSearchCode.cs b/Src/FastData.Generator.CSharp/Internal/Generators/EytzingerSearchCode.cs
@@ -8,7 +8,7 @@ internal sealed class EytzingerSearchCode<T>(EytzingerSearchContext<T> ctx, CSha
     public override string Generate(ReadOnlySpan<T> data) =>
         $$"""
               {{FieldModifier}}{{TypeName}}[] _entries = new {{TypeName}}[] {
-          {{FormatColumns(ctx.Data, ToValueLabel)}}
+          {{FormatColumns(data, ToValueLabel)}}
               };
 
               {{MethodAttribute}}
diff --git a/Src/FastData.Generator.Rust/Internal/Generators/BinarySearchCode.cs b/Src/FastData.Generator.Rust/Internal/Generators/BinarySearchCode.cs
@@ -8,16 +8,16 @@ internal sealed class BinarySearchCode<T>(BinarySearchContext<T> ctx) : RustOutp
 {
     public override string Generate(ReadOnlySpan<T> data) =>
         $$"""
-              {{FieldModifier}}const ENTRIES: [{{TypeNameWithLifetime}}; {{ctx.Data.Length.ToStringInvariant()}}] = [
-          {{FormatColumns(ctx.Data, ToValueLabel)}}
+              {{FieldModifier}}const ENTRIES: [{{TypeNameWithLifetime}}; {{data.Length.ToStringInvariant()}}] = [
+          {{FormatColumns(data, ToValueLabel)}}
               ];
 
               {{MethodAttribute}}
               {{MethodModifier}}fn contains(value: {{TypeName}}) -> bool {
           {{EarlyExits}}
 
                   let mut lo: usize = 0;
-                  let mut hi: usize = {{(ctx.Data.Length - 1).ToStringInvariant()}};
+                  let mut hi: usize = {{(data.Length - 1).ToStringInvariant()}};
                   while lo <= hi {
                       let i = lo + ((hi - lo) >> 1);
                       let entry = Self::ENTRIES[i];
diff --git a/Src/FastData.Generator.Rust/Internal/Generators/EytzingerSearchCode.cs b/Src/FastData.Generator.Rust/Internal/Generators/EytzingerSearchCode.cs
@@ -7,8 +7,8 @@ internal sealed class EytzingerSearchCode<T>(EytzingerSearchContext<T> ctx) : Ru
 {
     public override string Generate(ReadOnlySpan<T> data) =>
         $$"""
-              {{FieldModifier}}const ENTRIES: [{{TypeName}}; {{ctx.Data.Length}}] = [
-          {{FormatColumns(ctx.Data, ToValueLabel)}}
+              {{FieldModifier}}const ENTRIES: [{{TypeName}}; {{data.Length}}] = [
+          {{FormatColumns(data, ToValueLabel)}}
               ];
 
               {{MethodAttribute}}
diff --git a/Src/FastData.InternalShared/Helpers/TestHelper.cs b/Src/FastData.InternalShared/Helpers/TestHelper.cs
@@ -2,6 +2,7 @@
 using System.Security.Cryptography;
 using System.Text;
 using Genbox.FastData.Enums;
+using Genbox.FastData.Generator.Extensions;
 using Genbox.FastData.Generators;
 using Genbox.FastData.Generators.Abstracts;
 using Genbox.FastData.Internal.Abstracts;
@@ -122,11 +123,12 @@ private static GeneratorSpec Generate<T, TContext>(Func<string, ICodeGenerator>
             _ => StructureType.Auto
         };
 
-        TContext context = structure.Create(vector.Values);
+        ReadOnlySpan<T> values = vector.Values.AsReadOnlySpan();
+        TContext context = structure.Create(ref values);
         ICodeGenerator generator = func(vector.Identifier);
 
         GeneratorConfig<T> genCfg = new GeneratorConfig<T>(structureType, FastDataGenerator.DefaultStringComparison, props);
-        string source = generator.Generate(vector.Values, genCfg, context);
+        string source = generator.Generate(values, genCfg, context);
         return new GeneratorSpec(vector.Identifier, source);
     }
 }
diff --git a/Src/FastData.Testbed/Tests/GPerfTest.cs b/Src/FastData.Testbed/Tests/GPerfTest.cs
@@ -47,7 +47,7 @@ public static void ProduceOutputs(string path)
 
             HashData hashData = HashData.Create(data, DataType.String, 1);
             HashSetPerfectStructure<string> structure = new HashSetPerfectStructure<string>(hashData);
-            structure.Create(data);
+            structure.Create(ref data);
         }
     }
 
diff --git a/Src/FastData.Tests/Verify/BinarySearch_Double_3.verified.txt b/Src/FastData.Tests/Verify/BinarySearch_Double_3.verified.txt
@@ -4,11 +4,5 @@
     0.0,
     1.7976931348623157E+308
   ],
-  "Context": {
-    "Data": [
-      -1.7976931348623157E+308,
-      0.0,
-      1.7976931348623157E+308
-    ]
-  }
+  "Context": {}
 }
diff --git a/Src/FastData.Tests/Verify/BinarySearch_Int32_3.verified.txt b/Src/FastData.Tests/Verify/BinarySearch_Int32_3.verified.txt
@@ -4,11 +4,5 @@
     0,
     2147483647
   ],
-  "Context": {
-    "Data": [
-      -2147483648,
-      0,
-      2147483647
-    ]
-  }
+  "Context": {}
 }
diff --git a/Src/FastData.Tests/Verify/BinarySearch_Int64_3.verified.txt b/Src/FastData.Tests/Verify/BinarySearch_Int64_3.verified.txt
@@ -4,11 +4,5 @@
     0,
     9223372036854775807
   ],
-  "Context": {
-    "Data": [
-      -9223372036854775808,
-      0,
-      9223372036854775807
-    ]
-  }
+  "Context": {}
 }
diff --git a/Src/FastData.Tests/Verify/BinarySearch_String_3.verified.txt b/Src/FastData.Tests/Verify/BinarySearch_String_3.verified.txt
@@ -4,11 +4,5 @@
     "item2",
     "item3"
   ],
-  "Context": {
-    "Data": [
-      "item1",
-      "item2",
-      "item3"
-    ]
-  }
+  "Context": {}
 }
diff --git a/Src/FastData/FastDataGenerator.cs b/Src/FastData/FastDataGenerator.cs
@@ -156,7 +156,7 @@ public static string Generate<T>(ReadOnlySpan<T> data, FastDataConfig fdCfg, ICo
 
     private static string Generate<T, TContext>(ICodeGenerator generator, GeneratorConfig<T> genCfg, IStructure<T, TContext> structure, ReadOnlySpan<T> data) where TContext : IContext<T>
     {
-        TContext res = structure.Create(data);
+        TContext res = structure.Create(ref data);
         return generator.Generate(data, genCfg, res);
     }
 
diff --git a/Src/FastData/Generators/Contexts/BinarySearchContext.cs b/Src/FastData/Generators/Contexts/BinarySearchContext.cs
@@ -4,7 +4,4 @@ namespace Genbox.FastData.Generators.Contexts;
 
 /// <summary>Provides a context for binary search-based data structures.</summary>
 /// <typeparam name="T">The type of elements in the array.</typeparam>
-public sealed class BinarySearchContext<T>(T[] data) : IContext<T>
-{
-    public T[] Data { get; } = data;
-}
+public sealed class BinarySearchContext<T> : IContext<T>;
diff --git a/Src/FastData/Generators/Contexts/EytzingerSearchContext.cs b/Src/FastData/Generators/Contexts/EytzingerSearchContext.cs
@@ -4,7 +4,4 @@ namespace Genbox.FastData.Generators.Contexts;
 
 /// <summary>Provides a context for Eytzinger layout search-based data structures.</summary>
 /// <typeparam name="T">The type of elements in the array.</typeparam>
-public sealed class EytzingerSearchContext<T>(T[] data) : IContext<T>
-{
-    public T[] Data { get; } = data;
-}
+public sealed class EytzingerSearchContext<T> : IContext<T>;
diff --git a/Src/FastData/Internal/Abstracts/IStructure.cs b/Src/FastData/Internal/Abstracts/IStructure.cs
@@ -4,5 +4,5 @@ namespace Genbox.FastData.Internal.Abstracts;
 
 internal interface IStructure<T, out TContext> where TContext : IContext<T>
 {
-    TContext Create(ReadOnlySpan<T> data);
+    TContext Create(ref ReadOnlySpan<T> data);
 }
diff --git a/Src/FastData/Internal/Structures/ArrayStructure.cs b/Src/FastData/Internal/Structures/ArrayStructure.cs
@@ -5,7 +5,7 @@ namespace Genbox.FastData.Internal.Structures;
 
 internal sealed class ArrayStructure<T> : IStructure<T, ArrayContext<T>>
 {
-    public ArrayContext<T> Create(ReadOnlySpan<T> data)
+    public ArrayContext<T> Create(ref ReadOnlySpan<T> data)
     {
         return new ArrayContext<T>();
     }
diff --git a/Src/FastData/Internal/Structures/BinarySearchStructure.cs b/Src/FastData/Internal/Structures/BinarySearchStructure.cs
@@ -7,9 +7,8 @@ namespace Genbox.FastData.Internal.Structures;
 
 internal sealed class BinarySearchStructure<T>(DataType dataType, StringComparison comparison) : IStructure<T, BinarySearchContext<T>>
 {
-    public BinarySearchContext<T> Create(ReadOnlySpan<T> data)
+    public BinarySearchContext<T> Create(ref ReadOnlySpan<T> data)
     {
-        //We make a copy to avoid altering the original data
         T[] copy = new T[data.Length];
         data.CopyTo(copy);
 
@@ -18,6 +17,7 @@ public BinarySearchContext<T> Create(ReadOnlySpan<T> data)
         else
             Array.Sort(copy);
 
-        return new BinarySearchContext<T>(copy);
+        data = copy;
+        return new BinarySearchContext<T>();
     }
 }
diff --git a/Src/FastData/Internal/Structures/ConditionalStructure.cs b/Src/FastData/Internal/Structures/ConditionalStructure.cs
@@ -5,7 +5,7 @@ namespace Genbox.FastData.Internal.Structures;
 
 internal sealed class ConditionalStructure<T> : IStructure<T, ConditionalContext<T>>
 {
-    public ConditionalContext<T> Create(ReadOnlySpan<T> data)
+    public ConditionalContext<T> Create(ref ReadOnlySpan<T> data)
     {
         return new ConditionalContext<T>();
     }
diff --git a/Src/FastData/Internal/Structures/EytzingerSearchStructure.cs b/Src/FastData/Internal/Structures/EytzingerSearchStructure.cs
@@ -7,7 +7,7 @@ namespace Genbox.FastData.Internal.Structures;
 
 internal sealed class EytzingerSearchStructure<T>(DataType dataType, StringComparison comparison) : IStructure<T, EytzingerSearchContext<T>>
 {
-    public EytzingerSearchContext<T> Create(ReadOnlySpan<T> data)
+    public EytzingerSearchContext<T> Create(ref ReadOnlySpan<T> data)
     {
         //We make a copy to avoid altering the original data
         T[] copy = new T[data.Length];
@@ -22,7 +22,8 @@ public EytzingerSearchContext<T> Create(ReadOnlySpan<T> data)
         int index = 0;
         EytzingerOrder(ref index, copy, output);
 
-        return new EytzingerSearchContext<T>(output);
+        data = output;
+        return new EytzingerSearchContext<T>();
     }
 
     private static void EytzingerOrder(ref int arrIdx, T[] data, T[] output, int eytIdx = 0)
diff --git a/Src/FastData/Internal/Structures/HashSetChainStructure.cs b/Src/FastData/Internal/Structures/HashSetChainStructure.cs
@@ -7,7 +7,7 @@ namespace Genbox.FastData.Internal.Structures;
 
 internal sealed class HashSetChainStructure<T>(HashData hashData) : IStructure<T, HashSetChainContext<T>>
 {
-    public HashSetChainContext<T> Create(ReadOnlySpan<T> data)
+    public HashSetChainContext<T> Create(ref ReadOnlySpan<T> data)
     {
         ulong size = (ulong)(data.Length * hashData.CapacityFactor);
 
diff --git a/Src/FastData/Internal/Structures/HashSetLinearStructure.cs b/Src/FastData/Internal/Structures/HashSetLinearStructure.cs
@@ -11,7 +11,7 @@ internal sealed class HashSetLinearStructure<T>(HashData hashData) : IStructure<
 {
     //TODO: Either implement a bitmap for seen buckets everywhere or don't use bitmaps for simplicity
 
-    public HashSetLinearContext<T> Create(ReadOnlySpan<T> data)
+    public HashSetLinearContext<T> Create(ref ReadOnlySpan<T> data)
     {
         ulong[] hashCodes = hashData.HashCodes;
         uint numBuckets = CalcNumBuckets(hashCodes, hashData.HashCodesUnique);
diff --git a/Src/FastData/Internal/Structures/HashSetPerfectStructure.cs b/Src/FastData/Internal/Structures/HashSetPerfectStructure.cs
@@ -6,7 +6,7 @@ namespace Genbox.FastData.Internal.Structures;
 
 internal sealed class HashSetPerfectStructure<T>(HashData hashData) : IStructure<T, HashSetPerfectContext<T>>
 {
-    public HashSetPerfectContext<T> Create(ReadOnlySpan<T> data)
+    public HashSetPerfectContext<T> Create(ref ReadOnlySpan<T> data)
     {
         if (!hashData.HashCodesPerfect)
             throw new InvalidOperationException("HashSetPerfectStructure can only be created with a perfect hash function.");
diff --git a/Src/FastData/Internal/Structures/KeyLengthStructure.cs b/Src/FastData/Internal/Structures/KeyLengthStructure.cs
@@ -6,7 +6,7 @@ namespace Genbox.FastData.Internal.Structures;
 
 internal sealed class KeyLengthStructure<T>(StringProperties props) : IStructure<T, KeyLengthContext<T>>
 {
-    public KeyLengthContext<T> Create(ReadOnlySpan<T> data)
+    public KeyLengthContext<T> Create(ref ReadOnlySpan<T> data)
     {
         if (typeof(T) != typeof(string))
             throw new InvalidCastException("This structure only works on strings");
diff --git a/Src/FastData/Internal/Structures/SingleValueStructure.cs b/Src/FastData/Internal/Structures/SingleValueStructure.cs
@@ -5,7 +5,7 @@ namespace Genbox.FastData.Internal.Structures;
 
 internal sealed class SingleValueStructure<T> : IStructure<T, SingleValueContext<T>>
 {
-    public SingleValueContext<T> Create(ReadOnlySpan<T> data)
+    public SingleValueContext<T> Create(ref ReadOnlySpan<T> data)
     {
         if (data.Length != 1)
             throw new InvalidOperationException("SingleValueStructure can only be created from a span with exactly one element.");
diff --git a/Src/FastData/PublicAPI.Unshipped.txt b/Src/FastData/PublicAPI.Unshipped.txt
@@ -48,10 +48,7 @@ Genbox.FastData.Generators.Contexts.ArrayContext<T>.ArrayContext() -> void
 Genbox.FastData.Generators.Contexts.ArrayContext<T>.ArrayContext(System.ReadOnlySpan<T> data) -> void
 Genbox.FastData.Generators.Contexts.ArrayContext<T>.Data.get -> System.ReadOnlySpan<T>
 Genbox.FastData.Generators.Contexts.BinarySearchContext<T>
-Genbox.FastData.Generators.Contexts.BinarySearchContext<T>.BinarySearchContext(T[]! data) -> void
-Genbox.FastData.Generators.Contexts.BinarySearchContext<T>.Data.get -> T[]!
-Genbox.FastData.Generators.Contexts.BinarySearchContext<T>.data.get -> T[]!
-Genbox.FastData.Generators.Contexts.BinarySearchContext<T>.data.init -> void
+Genbox.FastData.Generators.Contexts.BinarySearchContext<T>.BinarySearchContext() -> void
 Genbox.FastData.Generators.Contexts.ConditionalContext<T>
 Genbox.FastData.Generators.Contexts.ConditionalContext<T>.ConditionalContext() -> void
 Genbox.FastData.Generators.Contexts.ConditionalContext<T>.ConditionalContext(System.ReadOnlySpan<T> data) -> void
@@ -145,7 +142,6 @@ Genbox.FastData.Generators.Metadata
 Genbox.FastData.Generators.Metadata.Metadata(System.Version! version, System.DateTimeOffset timestamp) -> void
 Genbox.FastData.Generators.Metadata.Program.get -> string!
 Genbox.FastData.Generators.Metadata.Timestamp.get -> string!
-override Genbox.FastData.Generators.Contexts.BinarySearchContext<T>.ToString() -> string!
 override Genbox.FastData.Generators.Contexts.Misc.HashSetBucket.GetHashCode() -> int
 override Genbox.FastData.Generators.Contexts.Misc.HashSetEntry<T>.GetHashCode() -> int
 override Genbox.FastData.Generators.EarlyExits.LengthBitSetEarlyExit.Equals(object? obj) -> bool

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public static void ProduceOutputs(string path)`
`47`	`47`
`48`	`48`	`HashData hashData = HashData.Create(data, DataType.String, 1);`
`49`	`49`	`HashSetPerfectStructure<string> structure = new HashSetPerfectStructure<string>(hashData);`
`50`		`- structure.Create(data);`
	`50`	`+ structure.Create(ref data);`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`