Rename IsContiguous to IsConsecutive for consistency

Author: Genbox

Src/FastData.Tests/KeyAnalyzerTests.cs

@@ -7,40 +7,40 @@ namespace Genbox.FastData.Tests;
 public class KeyAnalyzerTests
 {
     [Fact]
-    public void GetProperties_IsContiguous_AllPrimitiveTypes()
+    public void GetProperties_IsConsecutive_Test()
     {
-        Assert.True(GetProperties(['a', 'b', 'c']).IsContiguous);
-        Assert.False(GetProperties(['a', 'c']).IsContiguous);
+        Assert.True(GetProperties(['a', 'b', 'c']).IsConsecutive);
+        Assert.False(GetProperties(['a', 'c']).IsConsecutive);
 
-        Assert.True(GetProperties(new sbyte[] { -1, 0, 1 }).IsContiguous);
-        Assert.False(GetProperties(new sbyte[] { -1, 1, 2 }).IsContiguous);
+        Assert.True(GetProperties(new sbyte[] { -1, 0, 1 }).IsConsecutive);
+        Assert.False(GetProperties(new sbyte[] { -1, 1, 2 }).IsConsecutive);
 
-        Assert.True(GetProperties(new byte[] { 1, 2, 3 }).IsContiguous);
-        Assert.False(GetProperties(new byte[] { 1, 3, 4 }).IsContiguous);
+        Assert.True(GetProperties(new byte[] { 1, 2, 3 }).IsConsecutive);
+        Assert.False(GetProperties(new byte[] { 1, 3, 4 }).IsConsecutive);
 
-        Assert.True(GetProperties(new short[] { 10, 11, 12 }).IsContiguous);
-        Assert.False(GetProperties(new short[] { 10, 11, 13 }).IsContiguous);
+        Assert.True(GetProperties(new short[] { 10, 11, 12 }).IsConsecutive);
+        Assert.False(GetProperties(new short[] { 10, 11, 13 }).IsConsecutive);
 
-        Assert.True(GetProperties(new ushort[] { 10, 11, 12 }).IsContiguous);
-        Assert.False(GetProperties(new ushort[] { 10, 11, 13 }).IsContiguous);
+        Assert.True(GetProperties(new ushort[] { 10, 11, 12 }).IsConsecutive);
+        Assert.False(GetProperties(new ushort[] { 10, 11, 13 }).IsConsecutive);
 
-        Assert.True(GetProperties([100, 101]).IsContiguous);
-        Assert.False(GetProperties([100, 102]).IsContiguous);
+        Assert.True(GetProperties([100, 101]).IsConsecutive);
+        Assert.False(GetProperties([100, 102]).IsConsecutive);
 
-        Assert.True(GetProperties([100u, 101u]).IsContiguous);
-        Assert.False(GetProperties([100u, 102u]).IsContiguous);
+        Assert.True(GetProperties([100u, 101u]).IsConsecutive);
+        Assert.False(GetProperties([100u, 102u]).IsConsecutive);
 
-        Assert.True(GetProperties([long.MaxValue - 2, long.MaxValue - 1, long.MaxValue]).IsContiguous);
-        Assert.False(GetProperties([1L, 3L, 4L]).IsContiguous);
+        Assert.True(GetProperties([long.MaxValue - 2, long.MaxValue - 1, long.MaxValue]).IsConsecutive);
+        Assert.False(GetProperties([1L, 3L, 4L]).IsConsecutive);
 
-        Assert.True(GetProperties([1ul, 2ul, 3ul]).IsContiguous);
-        Assert.False(GetProperties([1ul, 2ul, 4ul]).IsContiguous);
+        Assert.True(GetProperties([1ul, 2ul, 3ul]).IsConsecutive);
+        Assert.False(GetProperties([1ul, 2ul, 4ul]).IsConsecutive);
 
-        Assert.True(GetProperties([0.5f, 1.5f, 2.5f]).IsContiguous);
-        Assert.False(GetProperties([0f, 0.9f, 2f]).IsContiguous);
+        Assert.True(GetProperties([0.5f, 1.5f, 2.5f]).IsConsecutive);
+        Assert.False(GetProperties([0f, 0.9f, 2f]).IsConsecutive);
 
-        Assert.True(GetProperties([0.5d, 1.5d, 2.5d]).IsContiguous);
-        Assert.False(GetProperties([0d, 0.9d, 2d]).IsContiguous);
+        Assert.True(GetProperties([0.5d, 1.5d, 2.5d]).IsConsecutive);
+        Assert.False(GetProperties([0d, 0.9d, 2d]).IsConsecutive);
     }
 
     [Theory]

Src/FastData/FastDataGenerator.cs

@@ -90,8 +90,8 @@ private static string GenerateInternal<TKey, TValue>(TKey[] keys, TValue[]? valu
                 if (keys.Length == 1)
                     return GenerateWrapper(generator, genCfg, new SingleValueStructure<TKey, TValue>(), keys, values);
 
-                // RangeStructure handles contiguous keys; keyed lookups are limited to integer-like key types for now.
-                if (props.IsContiguous && (values == null || keyType is not (KeyType.Single or KeyType.Double or KeyType.String)))
+                // RangeStructure handles consecutive keys; keyed lookups are limited to integer-like key types.
+                if (props.IsConsecutive && (values == null || SupportsKeyedRange(keyType)))
                     return GenerateWrapper(generator, genCfg, new RangeStructure<TKey, TValue>(), keys, values);
 
                 // For small amounts of data, logic is the fastest. However, it increases the assembly size, so we want to try some special cases first.
@@ -225,6 +225,8 @@ private static string GenerateWrapper<TKey, TValue, TContext>(ICodeGenerator gen
         return generator.Generate(genCfg, res);
     }
 
+    private static bool SupportsKeyedRange(KeyType keyType) => keyType is not (KeyType.Single or KeyType.Double or KeyType.String);
+
     internal static Candidate GetBestHash(ReadOnlySpan<string> data, StringProperties props, StringAnalyzerConfig cfg, ILoggerFactory factory, GeneratorEncoding encoding, bool includeDefault)
     {
         Simulator sim = new Simulator(data.Length, encoding);

Src/FastData/Internal/Analysis/Properties/KeyProperties.cs

@@ -1,3 +1,3 @@
 namespace Genbox.FastData.Internal.Analysis.Properties;
 
-internal sealed record KeyProperties<T>(T MinKeyValue, T MaxKeyValue, bool HasZeroOrNaN, bool IsContiguous) : IProperties;
+internal sealed record KeyProperties<T>(T MinKeyValue, T MaxKeyValue, bool HasZeroOrNaN, bool IsConsecutive) : IProperties;