Skip to content

Commit ef1e52b

Browse files
committed
No CollectionUtils.RangeToList/RangeToArray usage
1 parent 5d843a4 commit ef1e52b

File tree

6 files changed

+13
-9
lines changed

6 files changed

+13
-9
lines changed

Orm/Xtensive.Orm.Tests.Core/Collections/CollectionUtilsTest.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ namespace Xtensive.Orm.Tests.Core.Collections
1616
public class CollectionUtilsTest
1717
{
1818
[Test]
19+
[Obsolete]
1920
public void RangeToArrayTest()
2021
{
2122
Assert.That(CollectionUtils.RangeToArray(1, 10).SequenceEqual(Enumerable.Range(1, 10)));
@@ -24,6 +25,7 @@ public void RangeToArrayTest()
2425
}
2526

2627
[Test]
28+
[Obsolete]
2729
public void RangeToListTest()
2830
{
2931
Assert.That(CollectionUtils.RangeToList(1, 10).SequenceEqual(Enumerable.Range(1, 10)));

Orm/Xtensive.Orm/Collections/CollectionUtils.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public static class CollectionUtils
2424
/// <exception cref="T:System.ArgumentOutOfRangeException">
2525
/// <paramref name="count"/> is less than 0.-or-
2626
/// <paramref name="start"/> + <paramref name="count"/> -1 is larger than <see cref="F:System.Int32.MaxValue"/>.</exception>
27+
[Obsolete("Enumerable.Range().ToArray() is several times faster")]
2728
public static int[] RangeToArray(int start, int count)
2829
{
2930
ArgumentValidator.EnsureArgumentIsGreaterThanOrEqual(count, 0, "count");
@@ -41,6 +42,7 @@ public static int[] RangeToArray(int start, int count)
4142
/// <exception cref="T:System.ArgumentOutOfRangeException">
4243
/// <paramref name="count"/> is less than 0.-or-
4344
/// <paramref name="start"/> + <paramref name="count"/> -1 is larger than <see cref="F:System.Int32.MaxValue"/>.</exception>
45+
[Obsolete("Enumerable.Range().ToList() is several times faster")]
4446
public static List<int> RangeToList(int start, int count)
4547
{
4648
ArgumentValidator.EnsureArgumentIsGreaterThanOrEqual(count, 0, "count");

Orm/Xtensive.Orm/Orm/Building/Builders/IndexBuilder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -805,15 +805,15 @@ private ColumnGroup BuildColumnGroup(IndexInfo index)
805805
var reflectedType = index.ReflectedType;
806806
var indexKeyColumns = index.KeyColumns;
807807
var keyColumns = index.IsPrimary
808-
? (IReadOnlyList<int>) CollectionUtils.RangeToArray(0, indexKeyColumns.Count)
808+
? (IReadOnlyList<int>) Enumerable.Range(0, indexKeyColumns.Count).ToArray()
809809
: indexKeyColumns
810810
.Select(static pair => pair.Key)
811811
.Concat(index.ValueColumns)
812812
.Select(static (c, i) => (c, i))
813813
.Where(static arg => arg.c.IsPrimaryKey)
814814
.Select(static arg => arg.i)
815815
.ToList();
816-
var columns = CollectionUtils.RangeToArray(0, indexKeyColumns.Count + index.ValueColumns.Count);
816+
var columns = Enumerable.Range(0, indexKeyColumns.Count + index.ValueColumns.Count).ToArray();
817817
return new ColumnGroup(reflectedType, keyColumns, columns);
818818
}
819819

Orm/Xtensive.Orm/Orm/EntitySetBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ private static EntitySetTypeState BuildEntitySetTypeState(FieldInfo field, Entit
940940
.Where(ci => ci.IsPrimaryKey)
941941
.Select(ci => ci.Field.MappingInfo.Offset)
942942
.ToList()
943-
: CollectionUtils.RangeToList(0, targetDescriptor.Count);
943+
: Enumerable.Range(0, targetDescriptor.Count).ToList();
944944

945945
var keyFieldCount = ownerDescriptor.Count + itemColumnOffsets.Count;
946946
var keyFieldTypes = ownerDescriptor

Orm/Xtensive.Orm/Orm/Rse/Transformation/ColumnMappingInspector.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ internal abstract class ColumnMappingInspector : CompilableProviderVisitor
2828

2929
public virtual CompilableProvider RemoveRedundantColumns()
3030
{
31-
mappings.Add(rootProvider, CollectionUtils.RangeToList(0, rootProvider.Header.Length));
31+
mappings.Add(rootProvider, Enumerable.Range(0, rootProvider.Header.Length).ToList());
3232
var visitedProvider = VisitCompilable(rootProvider);
3333
return visitedProvider != rootProvider
3434
? visitedProvider
@@ -89,25 +89,25 @@ protected override SelectProvider VisitSelect(SelectProvider provider)
8989
/// <inheritdoc/>
9090
protected override FreeTextProvider VisitFreeText(FreeTextProvider provider)
9191
{
92-
mappings[provider] = CollectionUtils.RangeToList(0, provider.Header.Length);
92+
mappings[provider] = Enumerable.Range(0, provider.Header.Length).ToList();
9393
return provider;
9494
}
9595

9696
protected override CompilableProvider VisitContainsTable(ContainsTableProvider provider)
9797
{
98-
mappings[provider] = CollectionUtils.RangeToList(0, provider.Header.Length);
98+
mappings[provider] = Enumerable.Range(0, provider.Header.Length).ToList();
9999
return provider;
100100
}
101101

102102
protected override IndexProvider VisitIndex(IndexProvider provider)
103103
{
104-
mappings[provider] = CollectionUtils.RangeToList(0, provider.Header.Length);
104+
mappings[provider] = Enumerable.Range(0, provider.Header.Length).ToList();
105105
return provider;
106106
}
107107

108108
protected override SeekProvider VisitSeek(SeekProvider provider)
109109
{
110-
mappings[provider] = CollectionUtils.RangeToList(0, provider.Header.Length);
110+
mappings[provider] = Enumerable.Range(0, provider.Header.Length).ToList();
111111
return provider;
112112
}
113113

Orm/Xtensive.Orm/Orm/Rse/Transformation/Internals/SkipTakeRewriter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ protected override CompilableProvider Visit(CompilableProvider cp)
5757
var headerCount = visitedProvider.Header.Length - 1;
5858
visitedProvider = new SelectProvider(
5959
visitedProvider,
60-
CollectionUtils.RangeToArray(0, headerCount));
60+
Enumerable.Range(0, headerCount).ToArray());
6161
}
6262

6363
return visitedProvider;

0 commit comments

Comments
 (0)