Skip to content

Fix HierarchyId to support numbers outside Int32 range #2359

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
AndriySvyryd merged 4 commits into from
Mar 5, 2026
Merged

Fix HierarchyId to support numbers outside Int32 range #2359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bac987c
Initial plan
Copilot Mar 5, 2026
3dca01d
Fix HierarchyId parsing to support numbers outside Int32 range
Copilot Mar 5, 2026
b470cc8
Remove accidentally committed global.json.bak
Copilot Mar 5, 2026
c7dc32e
Rename IntArrayToStirng to LongArrayToString and CompareIntArrays to …
Copilot Mar 5, 2026
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
40 changes: 20 additions & 20 deletions src/EntityFramework/Hierarchy/HierarchyId.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace System.Data.Entity.Hierarchy
public class HierarchyId : IComparable
{
private readonly string _hierarchyId;
private readonly int[][] _nodes;
private readonly long[][] _nodes;

/// <summary>
/// The Path separator character
Expand Down Expand Up @@ -62,16 +62,16 @@ public HierarchyId(string hierarchyId)
string.Format(CultureInfo.InvariantCulture, InvalidHierarchyIdExceptionMessage, hierarchyId), "hierarchyId");
}
int nodesCount = nodesStr.Length - 2;
var nodes = new int[nodesCount][];
var nodes = new long[nodesCount][];
for (int i = 0; i < nodesCount; i++)
{
string node = nodesStr[i + 1];
var intsStr = node.Split('.');
var ints = new int[intsStr.Length];
var ints = new long[intsStr.Length];
for (int j = 0; j < intsStr.Length; j++)
{
int num;
if (!int.TryParse(intsStr[j], out num))
long num;
if (!long.TryParse(intsStr[j], out num))
{
throw new ArgumentException(
string.Format(CultureInfo.InvariantCulture, InvalidHierarchyIdExceptionMessage, hierarchyId), "hierarchyId");
Expand Down Expand Up @@ -102,7 +102,7 @@ public HierarchyId GetAncestor(int n)
return new HierarchyId(PathSeparator);
}
string hierarchyStr = PathSeparator +
string.Join(PathSeparator, _nodes.Take(GetLevel() - n).Select(IntArrayToStirng))
string.Join(PathSeparator, _nodes.Take(GetLevel() - n).Select(LongArrayToString))
+ PathSeparator;
return new HierarchyId(hierarchyStr);
}
Expand Down Expand Up @@ -156,7 +156,7 @@ public HierarchyId GetDescendant(HierarchyId child1, HierarchyId child2)
//decrease the last part of the last node of the 1nd child
lastNode[lastNode.Length - 1]--;
hierarchyStr = PathSeparator +
string.Join(PathSeparator, result._nodes.Select(IntArrayToStirng))
string.Join(PathSeparator, result._nodes.Select(LongArrayToString))
+ PathSeparator;
return new HierarchyId(hierarchyStr);
}
Expand All @@ -167,13 +167,13 @@ public HierarchyId GetDescendant(HierarchyId child1, HierarchyId child2)
//increase the last part of the last node of the 2nd child
lastNode[lastNode.Length - 1]++;
hierarchyStr = PathSeparator +
string.Join(PathSeparator, result._nodes.Select(IntArrayToStirng))
string.Join(PathSeparator, result._nodes.Select(LongArrayToString))
+ PathSeparator;
return new HierarchyId(hierarchyStr);
}
var child1LastNode = child1._nodes.Last();
var child2LastNode = child2._nodes.Last();
var cmp = CompareIntArrays(child1LastNode, child2LastNode);
var cmp = CompareLongArrays(child1LastNode, child2LastNode);
if (cmp >= 0)
{
throw new ArgumentException(
Expand All @@ -195,12 +195,12 @@ public HierarchyId GetDescendant(HierarchyId child1, HierarchyId child2)
}
else
{
child1LastNode = child1LastNode.Concat(new[] { 1 }).ToArray();
child1LastNode = child1LastNode.Concat(new[] { 1L }).ToArray();
}
hierarchyStr = PathSeparator +
string.Join(PathSeparator, _nodes.Select(IntArrayToStirng))
string.Join(PathSeparator, _nodes.Select(LongArrayToString))
+ PathSeparator
+ IntArrayToStirng(child1LastNode)
+ LongArrayToString(child1LastNode)
+ PathSeparator;
return new HierarchyId(hierarchyStr);
}
Expand Down Expand Up @@ -247,7 +247,7 @@ public bool IsDescendantOf(HierarchyId parent)
}
for (int i = 0; i < parent.GetLevel(); i++)
{
int cmp = CompareIntArrays(_nodes[i], parent._nodes[i]);
int cmp = CompareLongArrays(_nodes[i], parent._nodes[i]);
if (cmp != 0)
{
return false;
Expand Down Expand Up @@ -279,12 +279,12 @@ public HierarchyId GetReparentedValue(HierarchyId oldRoot, HierarchyId newRoot)
sb.Append(PathSeparator);
foreach (var node in newRoot._nodes)
{
sb.Append(IntArrayToStirng(node));
sb.Append(LongArrayToString(node));
sb.Append(PathSeparator);
}
foreach (var node in _nodes.Skip(oldRoot.GetLevel()))
{
sb.Append(IntArrayToStirng(node));
sb.Append(LongArrayToString(node));
sb.Append(PathSeparator);
}
return new HierarchyId(sb.ToString());
Expand All @@ -300,18 +300,18 @@ public static HierarchyId Parse(string input)
return new HierarchyId(input);
}

private static string IntArrayToStirng(IEnumerable<int> array)
private static string LongArrayToString(IEnumerable<long> array)
{
return string.Join(".", array);
}

private static int CompareIntArrays(int[] array1, int[] array2)
private static int CompareLongArrays(long[] array1, long[] array2)
{
int count = Math.Min(array1.Length, array2.Length);
for (int i = 0; i < count; i++)
{
int item1 = array1[i];
int item2 = array2[i];
long item1 = array1[i];
long item2 = array2[i];
if (item1 < item2)
{
return -1;
Expand Down Expand Up @@ -365,7 +365,7 @@ public static int Compare(HierarchyId hid1, HierarchyId hid2)
{
var node1 = nodes1[i];
var node2 = nodes2[i];
int cmp = CompareIntArrays(node1, node2);
int cmp = CompareLongArrays(node1, node2);
if (cmp != 0)
{
return cmp;
Expand Down
20 changes: 20 additions & 0 deletions test/UnitTests/Hierarchy/HierarchyIdUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,26 @@ namespace System.Data.Entity.Spatial

public class HierarchyIdUnitTests
{
[Fact]
public void Parse_hierarchyid_with_numbers_outside_Int32_range()
{
var hid = HierarchyId.Parse("/239196746533516.54209197962074.2160059995/");
Assert.NotNull(hid);
Assert.Equal("/239196746533516.54209197962074.2160059995/", hid.ToString());
Assert.Equal(1, hid.GetLevel());
}

[Fact]
public void Compare_hierarchyids_with_large_numbers()
{
var hid1 = new HierarchyId("/239196746533516/");
var hid2 = new HierarchyId("/239196746533517/");
Assert.True(hid1 < hid2);
Assert.True(hid2 > hid1);
Assert.True(hid1 != hid2);
Assert.Equal(hid1, new HierarchyId("/239196746533516/"));
}

[Fact]
public void Check_hierarchyid_functions()
{
Expand Down