Skip to content

Optimize ColumnGatherer #423

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

Closed
wants to merge 2 commits into from
Closed

Optimize ColumnGatherer #423

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
587582f
Optimize `ColumnGatherer`
SergeiPavlov Nov 10, 2025
00dde46
Update Orm/Xtensive.Orm/Orm/Linq/Expressions/Visitors/ColumnGatherer.cs
SergeiPavlov Nov 11, 2025
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
29 changes: 10 additions & 19 deletions Orm/Xtensive.Orm/Orm/Linq/Expressions/Visitors/ColumnGatherer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,14 @@
// Created by: Alexis Kochetov
// Created: 2009.05.06

using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using Xtensive.Core;
using Xtensive.Orm.Rse.Providers;

namespace Xtensive.Orm.Linq.Expressions.Visitors
{
internal sealed class ColumnGatherer : PersistentExpressionVisitor
internal sealed class ColumnGatherer(ColumnExtractionModes columnExtractionModes) : PersistentExpressionVisitor
{
private readonly ColumnExtractionModes columnExtractionModes;
private readonly List<(ColNum, Expression)> columns = new();
private SubQueryExpression topSubquery;

Expand Down Expand Up @@ -61,13 +57,15 @@ public static IReadOnlyList<ColNum> GetColumns(Expression expression, ColumnExtr
{
var gatherer = new ColumnGatherer(columnExtractionModes);
gatherer.Visit(expression);
var distinct = gatherer.DistinctValues
? gatherer.columns.Select(p=>p.Item1).Distinct()
: gatherer.columns.Select(p=>p.Item1);
var ordered = gatherer.OrderedValues
? distinct.OrderBy(i => i)
: distinct;
return ordered.ToArray();
var columns = gatherer.columns.Select(p => p.Item1);
if (gatherer.DistinctValues && gatherer.OrderedValues) {
columns = new SortedSet<ColNum>(columns);
}
else {
columns = gatherer.DistinctValues ? columns.Distinct() : columns;
columns = gatherer.OrderedValues ? columns.OrderBy(i => i) : columns;
}
return columns.ToArray();
}

internal override Expression VisitMarker(MarkerExpression expression)
Expand Down Expand Up @@ -234,12 +232,5 @@ internal override Expression VisitFullTextExpression(FullTextExpression expressi
VisitColumnExpression(expression.RankExpression);
return expression;
}

// Constructors

private ColumnGatherer(ColumnExtractionModes columnExtractionModes)
{
this.columnExtractionModes = columnExtractionModes;
}
}
}