Skip to content

Commit b4422c6

Browse files
committed
Code formatting changes
1 parent 735e813 commit b4422c6

File tree

9 files changed

+17
-15
lines changed

9 files changed

+17
-15
lines changed

Orm/Xtensive.Orm/Orm/Linq/Translator.Expressions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ protected override Expression VisitTypeIs(TypeBinaryExpression tb)
5555

5656
// Structure
5757
var memberType = expression.GetMemberType();
58-
if (memberType==MemberType.Structure
58+
if (memberType == MemberType.Structure
5959
&& WellKnownOrmTypes.Structure.IsAssignableFrom(operandType)) {
6060
return FalseExpression;
6161
}
6262

6363
// Entity
64-
if (memberType==MemberType.Entity
64+
if (memberType == MemberType.Entity
6565
&& WellKnownOrmInterfaces.Entity.IsAssignableFrom(operandType)) {
6666
TypeInfo type = context.Model.Types[operandType];
6767

Orm/Xtensive.Orm/Orm/Providers/SqlCompiler.Index.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ private QueryAndBindings BuildJoinQuery(IndexInfo index)
134134
var keyColumnCount = index.KeyColumns.Count;
135135
var underlyingQueries = index.UnderlyingIndexes.Select(BuildProviderQuery);
136136

137-
var sourceTables = new List<SqlTable>();
137+
var sourceTables = new List<SqlTable>(index.UnderlyingIndexes.Count);
138138
List<QueryParameterBinding> resultBindings = null;
139139
if(index.UnderlyingIndexes.Any(i => i.IsVirtual)) {
140140
foreach(var item in underlyingQueries) {

Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/AggregateProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ private static Type GetMinMaxColumnType(Type sourceColumnType, AggregateType agg
137137
if (sourceColumnType == WellKnownTypes.DateOnly || sourceColumnType == WellKnownTypes.TimeOnly)
138138
return sourceColumnType;
139139
#endif
140-
throw AggregateNotSupported(sourceColumnType, aggregateType);
140+
throw AggregateNotSupported(sourceColumnType, aggregateType);
141141
}
142142
}
143143

Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/ContainsTableProvider.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ public ContainsTableProvider(FullTextIndexInfo index, Func<ParameterContext, str
5353
SearchCriteria = searchCriteria;
5454
FullFeatured = fullFeatured;
5555
PrimaryIndex = new IndexInfoRef(index.PrimaryIndex);
56-
TargetColumns = targetColumns.Select(tc => index.Columns.First(c => c.Column == tc))
57-
.ToList(targetColumns.Count)
56+
TargetColumns = targetColumns.SelectToList(tc => index.Columns.First(c => c.Column == tc))
5857
.AsReadOnly();
5958
TopN = topNByRank;
6059
if (FullFeatured) {
@@ -68,12 +67,12 @@ public ContainsTableProvider(FullTextIndexInfo index, Func<ParameterContext, str
6867
if (primaryIndexKeyColumns.Count!=1)
6968
throw new InvalidOperationException(Strings.ExOnlySingleColumnKeySupported);
7069
var fieldTypes = primaryIndexKeyColumns
71-
.Select(columnInfo => columnInfo.Key.ValueType)
70+
.Select(static columnInfo => columnInfo.Key.ValueType)
7271
.Append(WellKnownTypes.Double)
7372
.ToArray(primaryIndexKeyColumns.Count + 1);
7473
var tupleDescriptor = TupleDescriptor.Create(fieldTypes);
7574
var columns = primaryIndexKeyColumns
76-
.Select((c, i) => (Column) new MappedColumn("KEY", i, c.Key.ValueType))
75+
.Select(static (c, i) => (Column) new MappedColumn("KEY", i, c.Key.ValueType))
7776
.Append(new MappedColumn("RANK", tupleDescriptor.Count, WellKnownTypes.Double))
7877
.ToArray(primaryIndexKeyColumns.Count + 1);;
7978
indexHeader = new RecordSetHeader(tupleDescriptor, columns);

Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/FreeTextProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ public FreeTextProvider(
6161
if (primaryIndexKeyColumns.Count!=1)
6262
throw new InvalidOperationException(Strings.ExOnlySingleColumnKeySupported);
6363
var fieldTypes = primaryIndexKeyColumns
64-
.Select(columnInfo => columnInfo.Key.ValueType)
64+
.Select(static columnInfo => columnInfo.Key.ValueType)
6565
.Append(WellKnownTypes.Double)
6666
.ToArray(primaryIndexKeyColumns.Count + 1);
6767
var tupleDescriptor = TupleDescriptor.Create(fieldTypes);
6868
var columns = primaryIndexKeyColumns
69-
.Select((c, i) => (Column) new MappedColumn("KEY", i, c.Key.ValueType))
69+
.Select(static (c, i) => (Column) new MappedColumn("KEY", i, c.Key.ValueType))
7070
.Append(new MappedColumn("RANK", tupleDescriptor.Count, WellKnownTypes.Double))
7171
.ToArray(primaryIndexKeyColumns.Count + 1);
7272
indexHeader = new RecordSetHeader(tupleDescriptor, columns);

Orm/Xtensive.Orm/Orm/Rse/RecordSetHeader.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,9 @@ private static RecordSetHeader CreateHeader(IndexInfo indexInfo)
287287
.SelectToArray(static columnInfo => columnInfo.Key.ValueType);
288288
var keyDescriptor = TupleDescriptor.Create(keyFieldTypes);
289289

290-
var resultColumns = indexInfoColumns.Select((c,i) => (Column) new MappedColumn(new ColumnInfoRef(c), i,c.ValueType)).ToArray(indexInfoColumns.Count);
290+
var resultColumns = indexInfoColumns
291+
.Select(static (c,i) => (Column) new MappedColumn(new ColumnInfoRef(c), i, c.ValueType))
292+
.ToArray(indexInfoColumns.Count);
291293
var resultGroups = new[]{indexInfo.Group};
292294

293295
return new RecordSetHeader(

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,13 @@ public void ValidateSelectedColumnIndexes(SelectProvider provider)
6767

6868
private void SaveApplyPredicate(FilterProvider filter, ApplyParameter applyParameter)
6969
{
70+
var providerAndFilterColumns = (filter.Predicate, filter.Header.Columns);
7071
if (owner.State.Predicates.TryGetValue(applyParameter, out var predicates)) {
71-
predicates.Add((filter.Predicate, filter.Header.Columns));
72+
predicates.Add(providerAndFilterColumns);
7273
}
7374
else {
7475
owner.State.Predicates.Add(applyParameter,
75-
new List<(Expression<Func<Tuple, bool>>, ColumnCollection)> { (filter.Predicate, filter.Header.Columns) });
76+
new List<(Expression<Func<Tuple, bool>>, ColumnCollection)> { providerAndFilterColumns });
7677
}
7778
}
7879

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ private void VisitBinaryProvider(BinaryProvider provider,
322322
private Provider ProcesSelfConvertibleApply(ApplyProvider provider, CompilableProvider left,
323323
CompilableProvider right)
324324
{
325-
State.Predicates.Remove(provider.ApplyParameter);
325+
_ = State.Predicates.Remove(provider.ApplyParameter);
326326
if (left != provider.Left || right != provider.Right)
327327
return new ApplyProvider(provider.ApplyParameter, left, right, provider.IsInlined, provider.SequenceType, provider.ApplyType);
328328
return provider;

Orm/Xtensive.Orm/Sql/Compiler/Internals/PostCompiler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public override void Visit(CycleNode node)
8484
for (int i = 0, count = items.Count; i < count - 1; i++) {
8585
currentCycleItem = items[i];
8686
VisitNodes(node.Body);
87-
result.Append(node.Delimiter);
87+
_ = result.Append(node.Delimiter);
8888
}
8989
currentCycleItem = items[items.Count - 1];
9090
VisitNodes(node.Body);

0 commit comments

Comments
 (0)