Skip to content

Commit 49bbda5

Browse files
committed
Enumerable.Repeat(xxx, 1) replaced with .Append/EnumerableUtils.One
1 parent 51d471c commit 49bbda5

5 files changed

Lines changed: 15 additions & 12 deletions

File tree

Orm/Xtensive.Orm/Orm/Providers/MultidatabaseMappingResolver.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (C) 2014 Xtensive LLC.
1+
// Copyright (C) 2014 Xtensive LLC.
22
// All rights reserved.
33
// For conditions of distribution and use, see license.
44
// Created by: Denis Krjuchkov
@@ -87,8 +87,7 @@ from rule in configuration.MappingRules
8787
where db==database
8888
select string.IsNullOrEmpty(rule.Schema) ? configuration.DefaultSchema : rule.Schema;
8989

90-
return userSchemas
91-
.Concat(Enumerable.Repeat(configuration.DefaultSchema, 1))
90+
return userSchemas.Append(configuration.DefaultSchema)
9291
.Distinct();
9392
}
9493

@@ -97,7 +96,7 @@ private static IEnumerable<string> GetDatabases(DomainConfiguration configuratio
9796
return configuration.MappingRules
9897
.Select(r => r.Database)
9998
.Where(db => !string.IsNullOrEmpty(db))
100-
.Concat(Enumerable.Repeat(configuration.DefaultDatabase, 1))
99+
.Append(configuration.DefaultDatabase)
101100
.Distinct();
102101
}
103102

Orm/Xtensive.Orm/Orm/Providers/MultischemaMappingResolver.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (C) 2014 Xtensive LLC.
1+
// Copyright (C) 2014 Xtensive LLC.
22
// All rights reserved.
33
// For conditions of distribution and use, see license.
44
// Created by: Denis Krjuchkov
@@ -7,6 +7,7 @@
77
using System;
88
using System.Collections.Generic;
99
using System.Linq;
10+
using Xtensive.Collections;
1011
using Xtensive.Orm.Configuration;
1112
using Xtensive.Orm.Upgrade;
1213
using Xtensive.Sql;
@@ -54,7 +55,7 @@ public override IEnumerable<SqlExtractionTask> GetSchemaTasks()
5455

5556
public override IEnumerable<SqlExtractionTask> GetMetadataTasks()
5657
{
57-
return Enumerable.Repeat(metadataTask, 1);
58+
return EnumerableUtils.One(metadataTask);
5859
}
5960

6061
private string FormatNodeName(string mappingSchema, string mappingName)
@@ -74,7 +75,7 @@ public MultischemaMappingResolver(DomainConfiguration configuration, NodeConfigu
7475
extractionTasks = configuration.MappingRules
7576
.Select(r => r.Schema)
7677
.Where(s => !string.IsNullOrEmpty(s))
77-
.Concat(Enumerable.Repeat(configuration.DefaultSchema, 1))
78+
.Append(configuration.DefaultSchema)
7879
.Distinct()
7980
.Select(s => new SqlExtractionTask(defaultSchemaInfo.Database, schemaMapping.Apply(s)))
8081
.ToList();

Orm/Xtensive.Orm/Orm/Providers/SimpleMappingResolver.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
// Copyright (C) 2014 Xtensive LLC.
1+
// Copyright (C) 2014 Xtensive LLC.
22
// All rights reserved.
33
// For conditions of distribution and use, see license.
44
// Created by: Denis Krjuchkov
55
// Created: 2014.03.13
66

77
using System.Collections.Generic;
88
using System.Linq;
9+
using Xtensive.Collections;
910
using Xtensive.Orm.Upgrade;
1011
using Xtensive.Sql;
1112
using Xtensive.Sql.Info;
@@ -40,12 +41,12 @@ public override MappingResolveResult Resolve(SchemaExtractionResult model, strin
4041

4142
public override IEnumerable<SqlExtractionTask> GetSchemaTasks()
4243
{
43-
return Enumerable.Repeat(extractionTask, 1);
44+
return EnumerableUtils.One(extractionTask);
4445
}
4546

4647
public override IEnumerable<SqlExtractionTask> GetMetadataTasks()
4748
{
48-
return Enumerable.Repeat(extractionTask, 1);
49+
return EnumerableUtils.One(extractionTask);
4950
}
5051

5152
// Constructors

Orm/Xtensive.Orm/Orm/Providers/SqlCompiler.Helpers.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
using Xtensive.Sql;
1717
using Xtensive.Sql.Dml;
1818
using Xtensive.Tuples;
19+
using Xtensive.Collections;
1920

2021
namespace Xtensive.Orm.Providers
2122
{
@@ -28,7 +29,7 @@ protected SqlProvider CreateProvider(SqlSelect statement,
2829
protected SqlProvider CreateProvider(SqlSelect statement, QueryParameterBinding extraBinding,
2930
CompilableProvider origin, params ExecutableProvider[] sources)
3031
{
31-
var extraBindings = extraBinding!=null ? Enumerable.Repeat(extraBinding, 1) : null;
32+
var extraBindings = extraBinding!=null ? EnumerableUtils.One(extraBinding) : null;
3233
return CreateProvider(statement, extraBindings, origin, sources);
3334
}
3435

Orm/Xtensive.Orm/Orm/Providers/StorageSequenceAccessor.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System;
88
using System.Collections.Generic;
99
using System.Linq;
10+
using Xtensive.Collections;
1011
using Xtensive.Core;
1112
using Xtensive.IoC;
1213
using Xtensive.Orm.Configuration;
@@ -36,7 +37,7 @@ public Segment<long> NextBulk(SequenceInfo sequenceInfo, Session session)
3637

3738
long hiValue = Execute(query, session);
3839
if (executionFromUpgrade && !hasAISettingsInMemory)
39-
CleanUp(Enumerable.Repeat(sequenceInfo, 1), session);
40+
CleanUp(EnumerableUtils.One(sequenceInfo), session);
4041

4142
var increment = sequenceInfo.Increment;
4243
var current = hasArbitaryIncrement ? hiValue - increment : (hiValue - 1) * increment;

0 commit comments

Comments
 (0)