Skip to content

Commit 30e1819

Browse files
alex-kulakovalex-kulakov
committed
Code improvements
StorageDriver: ConcurrentDictionary replaced with regular Distionary, SqlDriver: Removed unused property SqlServer driver factory: reorganized connection opening w/ and w/o notification Other minor changes
1 parent 4b354f2 commit 30e1819

File tree

14 files changed

+384
-190
lines changed

14 files changed

+384
-190
lines changed

‎Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/DriverFactory.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ protected override SqlDriver CreateDriver(string connectionString, SqlDriverConf
3434
{
3535
using var connection = new FbConnection(connectionString);
3636
if (configuration.ConnectionHandlers.Count > 0)
37-
OpenConnectionWithNotifications(connection, configuration, false).GetAwaiter().GetResult();
37+
OpenConnectionWithNotification(connection, configuration, false).GetAwaiter().GetResult();
3838
else
3939
OpenConnectionFast(connection, configuration, false).GetAwaiter().GetResult();
4040
var defaultSchema = GetDefaultSchema(connection);
@@ -48,7 +48,7 @@ protected override async Task<SqlDriver> CreateDriverAsync(
4848
var connection = new FbConnection(connectionString);
4949
await using (connection.ConfigureAwait(false)) {
5050
if (configuration.ConnectionHandlers.Count > 0)
51-
await OpenConnectionWithNotifications(connection, configuration, true, token).ConfigureAwait(false);
51+
await OpenConnectionWithNotification(connection, configuration, true, token).ConfigureAwait(false);
5252
else
5353
await OpenConnectionFast(connection, configuration, true, token).ConfigureAwait(false);
5454
var defaultSchema = await GetDefaultSchemaAsync(connection, token: token).ConfigureAwait(false);
@@ -122,7 +122,8 @@ protected override Task<DefaultSchemaInfo> ReadDefaultSchemaAsync(
122122
DbConnection connection, DbTransaction transaction, CancellationToken token) =>
123123
SqlHelper.ReadDatabaseAndSchemaAsync(DatabaseAndSchemaQuery, connection, transaction, token);
124124

125-
private async ValueTask OpenConnectionFast(FbConnection connection, SqlDriverConfiguration configuration, bool isAsync, CancellationToken cancellationToken = default)
125+
private static async ValueTask OpenConnectionFast(FbConnection connection,
126+
SqlDriverConfiguration configuration, bool isAsync, CancellationToken cancellationToken = default)
126127
{
127128
if (!isAsync) {
128129
connection.Open();
@@ -134,7 +135,8 @@ private async ValueTask OpenConnectionFast(FbConnection connection, SqlDriverCon
134135
}
135136
}
136137

137-
private async ValueTask OpenConnectionWithNotifications(FbConnection connection, SqlDriverConfiguration configuration, bool isAsync, CancellationToken cancellationToken = default)
138+
private static async ValueTask OpenConnectionWithNotification(FbConnection connection,
139+
SqlDriverConfiguration configuration, bool isAsync, CancellationToken cancellationToken = default)
138140
{
139141
var handlers = configuration.ConnectionHandlers;
140142
if (!isAsync) {

‎Orm/Xtensive.Orm.MySql/Sql.Drivers.MySql/DriverFactory.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ protected override SqlDriver CreateDriver(string connectionString, SqlDriverConf
7171
{
7272
using (var connection = new MySqlConnection(connectionString)) {
7373
if (configuration.ConnectionHandlers.Count > 0)
74-
OpenConnectionWithNotifications(connection, configuration, false).GetAwaiter().GetResult();
74+
OpenConnectionWithNotification(connection, configuration, false).GetAwaiter().GetResult();
7575
else
7676
OpenConnectionFast(connection, configuration, false).GetAwaiter().GetResult();
7777
var versionString = string.IsNullOrEmpty(configuration.ForcedServerVersion)
@@ -91,7 +91,7 @@ protected override async Task<SqlDriver> CreateDriverAsync(
9191
var connection = new MySqlConnection(connectionString);
9292
await using (connection.ConfigureAwait(false)) {
9393
if (configuration.ConnectionHandlers.Count > 0)
94-
await OpenConnectionWithNotifications(connection, configuration, true, token).ConfigureAwait(false);
94+
await OpenConnectionWithNotification(connection, configuration, true, token).ConfigureAwait(false);
9595
else
9696
await OpenConnectionFast(connection, configuration, true, token).ConfigureAwait(false);
9797
var versionString = string.IsNullOrEmpty(configuration.ForcedServerVersion)
@@ -151,7 +151,7 @@ private async ValueTask OpenConnectionFast(MySqlConnection connection,
151151
}
152152
}
153153

154-
private async ValueTask OpenConnectionWithNotifications(MySqlConnection connection,
154+
private async ValueTask OpenConnectionWithNotification(MySqlConnection connection,
155155
SqlDriverConfiguration configuration,
156156
bool isAsync,
157157
CancellationToken cancellationToken = default)

‎Orm/Xtensive.Orm.Oracle/Sql.Drivers.Oracle/DriverFactory.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ protected override SqlDriver CreateDriver(string connectionString, SqlDriverConf
7272
{
7373
using var connection = new OracleConnection(connectionString);
7474
if (configuration.ConnectionHandlers.Count > 0)
75-
OpenConnectionWithNotifications(connection, configuration, false).GetAwaiter().GetResult();
75+
OpenConnectionWithNotification(connection, configuration, false).GetAwaiter().GetResult();
7676
else
7777
OpenConnectionFast(connection, configuration, false).GetAwaiter().GetResult();
7878
var version = string.IsNullOrEmpty(configuration.ForcedServerVersion)
@@ -89,7 +89,7 @@ protected override async Task<SqlDriver> CreateDriverAsync(
8989
var connection = new OracleConnection(connectionString);
9090
await using (connection.ConfigureAwait(false)) {
9191
if (configuration.ConnectionHandlers.Count > 0)
92-
await OpenConnectionWithNotifications(connection, configuration, true, token).ConfigureAwait(false);
92+
await OpenConnectionWithNotification(connection, configuration, true, token).ConfigureAwait(false);
9393
else
9494
await OpenConnectionFast(connection, configuration, true, token).ConfigureAwait(false);
9595
var version = string.IsNullOrEmpty(configuration.ForcedServerVersion)
@@ -144,7 +144,7 @@ private async ValueTask OpenConnectionFast(OracleConnection connection,
144144
}
145145
}
146146

147-
private async ValueTask OpenConnectionWithNotifications(OracleConnection connection,
147+
private async ValueTask OpenConnectionWithNotification(OracleConnection connection,
148148
SqlDriverConfiguration configuration,
149149
bool isAsync,
150150
CancellationToken cancellationToken = default)

‎Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/DriverFactory.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ protected override SqlDriver CreateDriver(string connectionString, SqlDriverConf
6262
{
6363
using var connection = new NpgsqlConnection(connectionString);
6464
if (configuration.ConnectionHandlers.Count > 0)
65-
OpenConnectionWithNotifications(connection, configuration, false).GetAwaiter().GetResult();
65+
OpenConnectionWithNotification(connection, configuration, false).GetAwaiter().GetResult();
6666
else
6767
OpenConnectionFast(connection, configuration, false).GetAwaiter().GetResult();
6868
var version = GetVersion(configuration, connection);
@@ -77,7 +77,7 @@ protected override async Task<SqlDriver> CreateDriverAsync(
7777
var connection = new NpgsqlConnection(connectionString);
7878
await using (connection.ConfigureAwait(false)) {
7979
if (configuration.ConnectionHandlers.Count > 0)
80-
await OpenConnectionWithNotifications(connection, configuration, true, token).ConfigureAwait(false);
80+
await OpenConnectionWithNotification(connection, configuration, true, token).ConfigureAwait(false);
8181
else
8282
await OpenConnectionFast(connection, configuration, true, token).ConfigureAwait(false);
8383
var version = GetVersion(configuration, connection);
@@ -150,7 +150,7 @@ private async ValueTask OpenConnectionFast(NpgsqlConnection connection,
150150
}
151151
}
152152

153-
private async ValueTask OpenConnectionWithNotifications(NpgsqlConnection connection,
153+
private async ValueTask OpenConnectionWithNotification(NpgsqlConnection connection,
154154
SqlDriverConfiguration configuration,
155155
bool isAsync,
156156
CancellationToken cancellationToken = default)

‎Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/Connection.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public override void Open()
4444
OpenWithCheckFast(DefaultCheckConnectionQuery);
4545
}
4646
else {
47-
OpenWithCheckAndNotifications(DefaultCheckConnectionQuery, connectionHandlers);
47+
OpenWithCheckAndNotification(DefaultCheckConnectionQuery, connectionHandlers);
4848
}
4949
}
5050
}
@@ -62,7 +62,7 @@ public override Task OpenAsync(CancellationToken cancellationToken)
6262
return OpenWithCheckFastAsync(DefaultCheckConnectionQuery, cancellationToken);
6363
}
6464
else {
65-
return OpenWithCheckAndNotificationsAsync(DefaultCheckConnectionQuery, connectionHandlers, cancellationToken);
65+
return OpenWithCheckAndNotificationAsync(DefaultCheckConnectionQuery, connectionHandlers, cancellationToken);
6666
}
6767
}
6868

@@ -82,7 +82,7 @@ public override void OpenAndInitialize(string initializationScript)
8282
OpenWithCheckFast(script);
8383
}
8484
else {
85-
OpenWithCheckAndNotifications(script, connectionHandlers);
85+
OpenWithCheckAndNotification(script, connectionHandlers);
8686
}
8787
}
8888

@@ -99,7 +99,7 @@ public override Task OpenAndInitializeAsync(string initializationScript, Cancell
9999
var connectionHandlers = Extensions.Get<ConnectionHandlersExtension>();
100100
return connectionHandlers == null
101101
? OpenWithCheckFastAsync(script, token)
102-
: OpenWithCheckAndNotificationsAsync(script, connectionHandlers, token);
102+
: OpenWithCheckAndNotificationAsync(script, connectionHandlers, token);
103103
}
104104

105105
/// <inheritdoc/>
@@ -251,7 +251,7 @@ private void OpenWithCheckFast(string checkQueryString)
251251
}
252252
}
253253

254-
private void OpenWithCheckAndNotifications(string checkQueryString, ConnectionHandlersExtension connectionHandlers)
254+
private void OpenWithCheckAndNotification(string checkQueryString, ConnectionHandlersExtension connectionHandlers)
255255
{
256256
var connectionChecked = false;
257257
var restoreTriggered = false;
@@ -330,7 +330,7 @@ private async Task OpenWithCheckFastAsync(string checkQueryString, CancellationT
330330
}
331331
}
332332

333-
private async Task OpenWithCheckAndNotificationsAsync(string checkQueryString,
333+
private async Task OpenWithCheckAndNotificationAsync(string checkQueryString,
334334
ConnectionHandlersExtension connectionHandlers, CancellationToken cancellationToken)
335335
{
336336
var connectionChecked = false;

0 commit comments

Comments
 (0)