A few fixes

Genbox · Genbox · commit 9577e5f5ec73 · 2026-02-16T22:32:32.000+01:00
diff --git a/Src/FastData.Cli.Tests/CommandOutputs/cpp_-s HashTable_Files_Strings.input.verified.txt b/Src/FastData.Cli.Tests/CommandOutputs/cpp_-s HashTable_Files_Strings.input.verified.txt
@@ -37,10 +37,8 @@ public:
     static constexpr bool contains(const std::string_view key) noexcept {
          if (key.length() != 5u)
              return false;
-        uint32_t firstChar = static_cast<uint32_t>(key.front());
-        uint32_t lastChar = static_cast<uint32_t>(key.back());
-
-        if (firstChar < 116u || firstChar > 116u || lastChar < 49u || lastChar > 50u)
+        uint32_t valueChar = static_cast<uint32_t>(key.front());
+        if (valueChar != 116u)
             return false;
 
 
diff --git a/Src/FastData.Cli.Tests/CommandOutputs/cpp_Files_Strings.input.verified.txt b/Src/FastData.Cli.Tests/CommandOutputs/cpp_Files_Strings.input.verified.txt
@@ -15,10 +15,8 @@ public:
     static constexpr bool contains(const std::string_view key) noexcept {
          if (key.length() != 5u)
              return false;
-        uint32_t firstChar = static_cast<uint32_t>(key.front());
-        uint32_t lastChar = static_cast<uint32_t>(key.back());
-
-        if (firstChar < 116u || firstChar > 116u || lastChar < 49u || lastChar > 50u)
+        uint32_t valueChar = static_cast<uint32_t>(key.front());
+        if (valueChar != 116u)
             return false;
 
         if (key == u8"test1" || key == u8"test2")
diff --git a/Src/FastData.Cli.Tests/CommandOutputs/csharp_-s HashTable_Files_Strings.input.verified.txt b/Src/FastData.Cli.Tests/CommandOutputs/csharp_-s HashTable_Files_Strings.input.verified.txt
@@ -60,9 +60,8 @@ internal static class MyData
     {
         if (key.Length != 5u)
             return false;
-        char firstChar = key[0];
-        char lastChar = key[key.Length - 1];
-        if (firstChar < 't' || firstChar > 't' || lastChar < '1' || lastChar > '2')
+        char valueChar = key[0];
+        if (valueChar != 't')
             return false;
 
 
diff --git a/Src/FastData.Cli.Tests/CommandOutputs/csharp_Files_Strings.input.verified.txt b/Src/FastData.Cli.Tests/CommandOutputs/csharp_Files_Strings.input.verified.txt
@@ -15,9 +15,8 @@ internal static class MyData
     {
         if (key.Length != 5u)
             return false;
-        char firstChar = key[0];
-        char lastChar = key[key.Length - 1];
-        if (firstChar < 't' || firstChar > 't' || lastChar < '1' || lastChar > '2')
+        char valueChar = key[0];
+        if (valueChar != 't')
             return false;
 
 
diff --git a/Src/FastData.Cli.Tests/CommandOutputs/rust_-s HashTable_Files_Strings.input.verified.txt b/Src/FastData.Cli.Tests/CommandOutputs/rust_-s HashTable_Files_Strings.input.verified.txt
@@ -47,10 +47,8 @@ const ENTRIES: [e; 2] = [
         }
         let bytes = key.as_bytes();
         let len = bytes.len();
-        let first_char = bytes[0];
-        let last_char = bytes[len - 1];
-
-        if first_char < 116u8 || first_char > 116u8 || last_char < 49u8 || last_char > 50u8 {
+        let value_char = bytes[0];
+        if value_char != 116 {
             return false;
         }
 
diff --git a/Src/FastData.Cli.Tests/CommandOutputs/rust_Files_Strings.input.verified.txt b/Src/FastData.Cli.Tests/CommandOutputs/rust_Files_Strings.input.verified.txt
@@ -18,10 +18,8 @@ impl MyData {
         }
         let bytes = key.as_bytes();
         let len = bytes.len();
-        let first_char = bytes[0];
-        let last_char = bytes[len - 1];
-
-        if first_char < 116u8 || first_char > 116u8 || last_char < 49u8 || last_char > 50u8 {
+        let value_char = bytes[0];
+        if value_char != 116 {
             return false;
         }
 
diff --git a/Src/FastData.TestHarness.Runner/Verify/Vectors/CSharp/ValueVectors_ArrayStructure_String_13_non_ascii.verified.txt b/Src/FastData.TestHarness.Runner/Verify/Vectors/CSharp/ValueVectors_ArrayStructure_String_13_non_ascii.verified.txt
@@ -18,19 +18,10 @@ internal static class ArrayStructure_String_13_non_ascii
     {
         if (key.Length != 1u)
             return false;
-        uint valueChar = key[0];
-        if (valueChar > 0x7F)
+        ulong first = (ulong)key[0];
+
+        if ((first & 65280UL) != 0)
             return false;
-        if (valueChar < 64)
-        {
-            if (((1UL << (int)valueChar) & 0UL) == 0)
-                return false;
-        }
-        else
-        {
-            if (((1UL << (int)(valueChar - 64)) & 0UL) == 0)
-                return false;
-        }
 
 
         for (int i = 0; i < 13; i++)
diff --git a/Src/FastData.TestHarness.Runner/Verify/Vectors/CSharp/ValueVectors_BinarySearchStructure_String_13_non_ascii.verified.txt b/Src/FastData.TestHarness.Runner/Verify/Vectors/CSharp/ValueVectors_BinarySearchStructure_String_13_non_ascii.verified.txt
@@ -18,19 +18,10 @@ internal static class BinarySearchStructure_String_13_non_ascii
     {
         if (key.Length != 1u)
             return false;
-        uint valueChar = key[0];
-        if (valueChar > 0x7F)
+        ulong first = (ulong)key[0];
+
+        if ((first & 65280UL) != 0)
             return false;
-        if (valueChar < 64)
-        {
-            if (((1UL << (int)valueChar) & 0UL) == 0)
-                return false;
-        }
-        else
-        {
-            if (((1UL << (int)(valueChar - 64)) & 0UL) == 0)
-                return false;
-        }
 
         int lo = 0;
         int hi = 12;
diff --git a/Src/FastData.TestHarness.Runner/Verify/Vectors/CSharp/ValueVectors_BloomFilterStructure_String_13_non_ascii.verified.txt b/Src/FastData.TestHarness.Runner/Verify/Vectors/CSharp/ValueVectors_BloomFilterStructure_String_13_non_ascii.verified.txt
@@ -35,19 +35,10 @@ internal static class BloomFilterStructure_String_13_non_ascii
     {
         if (key.Length != 1u)
             return false;
-        uint valueChar = key[0];
-        if (valueChar > 0x7F)
+        ulong first = (ulong)key[0];
+
+        if ((first & 65280UL) != 0)
             return false;
-        if (valueChar < 64)
-        {
-            if (((1UL << (int)valueChar) & 0UL) == 0)
-                return false;
-        }
-        else
-        {
-            if (((1UL << (int)(valueChar - 64)) & 0UL) == 0)
-                return false;
-        }
 
 
         ulong hash = Hash(key);
diff --git a/Src/FastData.TestHarness.Runner/Verify/Vectors/CSharp/ValueVectors_ConditionalStructure_String_13_non_ascii.verified.txt b/Src/FastData.TestHarness.Runner/Verify/Vectors/CSharp/ValueVectors_ConditionalStructure_String_13_non_ascii.verified.txt
@@ -13,19 +13,10 @@ internal static class ConditionalStructure_String_13_non_ascii
     {
         if (key.Length != 1u)
             return false;
-        uint valueChar = key[0];
-        if (valueChar > 0x7F)
+        ulong first = (ulong)key[0];
+
+        if ((first & 65280UL) != 0)
             return false;
-        if (valueChar < 64)
-        {
-            if (((1UL << (int)valueChar) & 0UL) == 0)
-                return false;
-        }
-        else
-        {
-            if (((1UL << (int)(valueChar - 64)) & 0UL) == 0)
-                return false;
-        }
 
 
         switch (key)
diff --git a/Src/FastData.TestHarness.Runner/Verify/Vectors/CSharp/ValueVectors_HashTableCompactStructure_String_13_non_ascii.verified.txt b/Src/FastData.TestHarness.Runner/Verify/Vectors/CSharp/ValueVectors_HashTableCompactStructure_String_13_non_ascii.verified.txt
@@ -60,19 +60,10 @@ internal static class HashTableCompactStructure_String_13_non_ascii
     {
         if (key.Length != 1u)
             return false;
-        uint valueChar = key[0];
-        if (valueChar > 0x7F)
+        ulong first = (ulong)key[0];
+
+        if ((first & 65280UL) != 0)
             return false;
-        if (valueChar < 64)
-        {
-            if (((1UL << (int)valueChar) & 0UL) == 0)
-                return false;
-        }
-        else
-        {
-            if (((1UL << (int)(valueChar - 64)) & 0UL) == 0)
-                return false;
-        }
 
 
         ulong hash = Hash(key);
diff --git a/Src/FastData.TestHarness.Runner/Verify/Vectors/CSharp/ValueVectors_HashTableStructure_String_13_non_ascii.verified.txt b/Src/FastData.TestHarness.Runner/Verify/Vectors/CSharp/ValueVectors_HashTableStructure_String_13_non_ascii.verified.txt
@@ -57,19 +57,10 @@ internal static class HashTableStructure_String_13_non_ascii
     {
         if (key.Length != 1u)
             return false;
-        uint valueChar = key[0];
-        if (valueChar > 0x7F)
+        ulong first = (ulong)key[0];
+
+        if ((first & 65280UL) != 0)
             return false;
-        if (valueChar < 64)
-        {
-            if (((1UL << (int)valueChar) & 0UL) == 0)
-                return false;
-        }
-        else
-        {
-            if (((1UL << (int)(valueChar - 64)) & 0UL) == 0)
-                return false;
-        }
 
 
         ulong hash = Hash(key);
diff --git a/Src/FastData/Generators/GeneratorConfig.cs b/Src/FastData/Generators/GeneratorConfig.cs
@@ -233,6 +233,9 @@ private static bool ShouldApplyCharMap(uint minLength, bool allAscii, GeneratorE
         if (minLength == 0)
             return false;
 
+        if (!allAscii)
+            return false;
+
         if (ignoreCase && !allAscii)
             return false;
 
diff --git a/Src/FastData/Internal/Analysis/KeyAnalyzer.cs b/Src/FastData/Internal/Analysis/KeyAnalyzer.cs
@@ -174,6 +174,9 @@ internal static StringKeyProperties GetStringProperties(ReadOnlySpan<string> key
         uint charDivisor = lengthGcd <= 1 ? 0u : lengthGcd;
         uint byteDivisor = byteGcd <= 1 ? 0u : byteGcd;
 
+        if (charDivisor == 0)
+            byteDivisor = 0;
+
         return new StringKeyProperties(new LengthData((uint)minByteCount, (uint)maxByteCount, uniqLen, lengthMap, charDivisor, byteDivisor), new DeltaData(prefix, left, suffix, right), new CharacterData(allAscii, charClass, stringBitMask, stringBitMaskLen, firstCharMap, lastCharMap));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -47,10 +47,8 @@ const ENTRIES: [e; 2] = [`
`47`	`47`	`}`
`48`	`48`	`let bytes = key.as_bytes();`
`49`	`49`	`let len = bytes.len();`
`50`		`- let first_char = bytes[0];`
`51`		`- let last_char = bytes[len - 1];`
`52`		`-`
`53`		`- if first_char < 116u8 \|\| first_char > 116u8 \|\| last_char < 49u8 \|\| last_char > 50u8 {`
	`50`	`+ let value_char = bytes[0];`
	`51`	`+ if value_char != 116 {`
`54`	`52`	`return false;`
`55`	`53`	`}`
`56`	`54`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,8 @@ impl MyData {`
`18`	`18`	`}`
`19`	`19`	`let bytes = key.as_bytes();`
`20`	`20`	`let len = bytes.len();`
`21`		`- let first_char = bytes[0];`
`22`		`- let last_char = bytes[len - 1];`
`23`		`-`
`24`		`- if first_char < 116u8 \|\| first_char > 116u8 \|\| last_char < 49u8 \|\| last_char > 50u8 {`
	`21`	`+ let value_char = bytes[0];`
	`22`	`+ if value_char != 116 {`
`25`	`23`	`return false;`
`26`	`24`	`}`
`27`	`25`