Skip to content

Commit 9ed9935

Browse files
cincuranetcincuranet
committed
Refactoring.
1 parent eb8bd3f commit 9ed9935

24 files changed

+127
-125
lines changed

‎Provider/src/FirebirdSql.Data.FirebirdClient/Common/AsyncWrappingCommonArgs.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ namespace FirebirdSql.Data.Common
2626
[StructLayout(LayoutKind.Auto)]
2727
internal struct AsyncWrappingCommonArgs
2828
{
29+
public static readonly AsyncWrappingCommonArgs Sync = new AsyncWrappingCommonArgs(false);
30+
2931
readonly bool _isAsync;
3032
readonly CancellationToken _cancellationTokenRaw;
3133
int _explicitCancel;

‎Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbCommand.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public override string CommandText
6464
{
6565
if (_commandText != value && _statement != null)
6666
{
67-
Release(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
67+
Release(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
6868
}
6969

7070
_commandText = value;
@@ -114,7 +114,7 @@ public override int CommandTimeout
114114
_connection != value &&
115115
_connection.State == ConnectionState.Open)
116116
{
117-
Release(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
117+
Release(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
118118
}
119119

120120
_connection = value;
@@ -147,7 +147,7 @@ public override int CommandTimeout
147147
throw new InvalidOperationException("There is already an open DataReader associated with this Command which must be closed first.");
148148
}
149149

150-
RollbackImplicitTransaction(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
150+
RollbackImplicitTransaction(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
151151

152152
_transaction = value;
153153

@@ -333,7 +333,7 @@ protected override void Dispose(bool disposing)
333333
{
334334
if (disposing)
335335
{
336-
DisposeHelper(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
336+
DisposeHelper(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
337337
}
338338
base.Dispose(disposing);
339339
}
@@ -418,7 +418,7 @@ public override void Cancel()
418418
return new FbParameter();
419419
}
420420

421-
public override void Prepare() => PrepareImpl(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
421+
public override void Prepare() => PrepareImpl(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
422422
#if NET48 || NETSTANDARD2_0
423423
public Task PrepareAsync(CancellationToken cancellationToken = default)
424424
#else
@@ -448,7 +448,7 @@ internal async Task PrepareImpl(AsyncWrappingCommonArgs async)
448448
}
449449
}
450450

451-
public override int ExecuteNonQuery() => ExecuteNonQueryImpl(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
451+
public override int ExecuteNonQuery() => ExecuteNonQueryImpl(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
452452
public override Task<int> ExecuteNonQueryAsync(CancellationToken cancellationToken) => ExecuteNonQueryImpl(new AsyncWrappingCommonArgs(true, cancellationToken));
453453
internal async Task<int> ExecuteNonQueryImpl(AsyncWrappingCommonArgs async)
454454
{
@@ -489,7 +489,7 @@ internal async Task<int> ExecuteNonQueryImpl(AsyncWrappingCommonArgs async)
489489
}
490490

491491
public new FbDataReader ExecuteReader() => ExecuteReader(CommandBehavior.Default);
492-
public new FbDataReader ExecuteReader(CommandBehavior behavior) => ExecuteReaderImpl(behavior, new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
492+
public new FbDataReader ExecuteReader(CommandBehavior behavior) => ExecuteReaderImpl(behavior, AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
493493
public new Task<FbDataReader> ExecuteReaderAsync() => ExecuteReaderAsync(CommandBehavior.Default);
494494
public new Task<FbDataReader> ExecuteReaderAsync(CommandBehavior behavior) => ExecuteReaderAsync(behavior, CancellationToken.None);
495495
public new Task<FbDataReader> ExecuteReaderAsync(CancellationToken cancellationToken) => ExecuteReaderAsync(CommandBehavior.Default, cancellationToken);
@@ -521,7 +521,7 @@ internal async Task<FbDataReader> ExecuteReaderImpl(CommandBehavior behavior, As
521521
return _activeReader;
522522
}
523523

524-
public override object ExecuteScalar() => ExecuteScalarImpl(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
524+
public override object ExecuteScalar() => ExecuteScalarImpl(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
525525
public override Task<object> ExecuteScalarAsync(CancellationToken cancellationToken) => ExecuteScalarImpl(new AsyncWrappingCommonArgs(true, cancellationToken));
526526
internal async Task<object> ExecuteScalarImpl(AsyncWrappingCommonArgs async)
527527
{
@@ -571,7 +571,7 @@ internal async Task<object> ExecuteScalarImpl(AsyncWrappingCommonArgs async)
571571
return val;
572572
}
573573

574-
public string GetCommandPlan() => GetCommandPlanImpl(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
574+
public string GetCommandPlan() => GetCommandPlanImpl(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
575575
public Task<string> GetCommandPlanAsync(CancellationToken cancellationToken = default) => GetCommandPlanImpl(new AsyncWrappingCommonArgs(true, cancellationToken));
576576
private Task<string> GetCommandPlanImpl(AsyncWrappingCommonArgs async)
577577
{
@@ -582,7 +582,7 @@ private Task<string> GetCommandPlanImpl(AsyncWrappingCommonArgs async)
582582
return _statement.GetExecutionPlan(async).AsTask();
583583
}
584584

585-
public string GetCommandExplainedPlan() => GetCommandExplainedPlanImpl(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
585+
public string GetCommandExplainedPlan() => GetCommandExplainedPlanImpl(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
586586
public Task<string> GetCommandExplainedPlanAsync(CancellationToken cancellationToken = default) => GetCommandExplainedPlanImpl(new AsyncWrappingCommonArgs(true, cancellationToken));
587587
private Task<string> GetCommandExplainedPlanImpl(AsyncWrappingCommonArgs async)
588588
{

‎Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnection.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static void ClearPool(string connectionString)
5555

5656
#region Static Database Creation/Drop methods
5757

58-
public static void CreateDatabase(string connectionString, int pageSize = 4096, bool forcedWrites = true, bool overwrite = false) => CreateDatabaseImpl(connectionString, pageSize, forcedWrites, overwrite, new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
58+
public static void CreateDatabase(string connectionString, int pageSize = 4096, bool forcedWrites = true, bool overwrite = false) => CreateDatabaseImpl(connectionString, pageSize, forcedWrites, overwrite, AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
5959
public static Task CreateDatabaseAsync(string connectionString, int pageSize = 4096, bool forcedWrites = true, bool overwrite = false, CancellationToken cancellationToken = default) => CreateDatabaseImpl(connectionString, pageSize, forcedWrites, overwrite, new AsyncWrappingCommonArgs(true, cancellationToken));
6060
private static async Task CreateDatabaseImpl(string connectionString, int pageSize, bool forcedWrites, bool overwrite, AsyncWrappingCommonArgs async)
6161
{
@@ -80,7 +80,7 @@ private static async Task CreateDatabaseImpl(string connectionString, int pageSi
8080
}
8181
}
8282

83-
public static void DropDatabase(string connectionString) => DropDatabaseImpl(connectionString, new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
83+
public static void DropDatabase(string connectionString) => DropDatabaseImpl(connectionString, AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
8484
public static Task DropDatabaseAsync(string connectionString, CancellationToken cancellationToken = default) => DropDatabaseImpl(connectionString, new AsyncWrappingCommonArgs(true, cancellationToken));
8585
static async Task DropDatabaseImpl(string connectionString, AsyncWrappingCommonArgs async)
8686
{
@@ -257,7 +257,7 @@ protected override void Dispose(bool disposing)
257257
{
258258
if (disposing)
259259
{
260-
DisposeHelper(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
260+
DisposeHelper(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
261261
}
262262
base.Dispose(disposing);
263263
}
@@ -309,7 +309,7 @@ public Task<FbTransaction> BeginTransactionAsync(IsolationLevel level, Cancellat
309309
=> BeginTransactionAsync(level, null, cancellationToken);
310310
public FbTransaction BeginTransaction(string transactionName) => BeginTransaction(FbTransaction.DefaultIsolationLevel, transactionName);
311311
public Task<FbTransaction> BeginTransactionAsync(string transactionName, CancellationToken cancellationToken = default) => BeginTransactionAsync(FbTransaction.DefaultIsolationLevel, transactionName, cancellationToken);
312-
public FbTransaction BeginTransaction(IsolationLevel level, string transactionName) => BeginTransactionImpl(level, transactionName, new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
312+
public FbTransaction BeginTransaction(IsolationLevel level, string transactionName) => BeginTransactionImpl(level, transactionName, AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
313313
public Task<FbTransaction> BeginTransactionAsync(IsolationLevel level, string transactionName, CancellationToken cancellationToken = default) => BeginTransactionImpl(level, transactionName, new AsyncWrappingCommonArgs(true, cancellationToken));
314314
internal Task<FbTransaction> BeginTransactionImpl(IsolationLevel level, string transactionName, AsyncWrappingCommonArgs async)
315315
{
@@ -320,7 +320,7 @@ internal Task<FbTransaction> BeginTransactionImpl(IsolationLevel level, string t
320320

321321
public FbTransaction BeginTransaction(FbTransactionOptions options) => BeginTransaction(options, null);
322322
public Task<FbTransaction> BeginTransactionAsync(FbTransactionOptions options, CancellationToken cancellationToken = default) => BeginTransactionAsync(options, null, cancellationToken);
323-
public FbTransaction BeginTransaction(FbTransactionOptions options, string transactionName) => BeginTransactionImpl(options, transactionName, new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
323+
public FbTransaction BeginTransaction(FbTransactionOptions options, string transactionName) => BeginTransactionImpl(options, transactionName, AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
324324
public Task<FbTransaction> BeginTransactionAsync(FbTransactionOptions options, string transactionName, CancellationToken cancellationToken = default) => BeginTransactionImpl(options, transactionName, new AsyncWrappingCommonArgs(true, cancellationToken));
325325
internal Task<FbTransaction> BeginTransactionImpl(FbTransactionOptions options, string transactionName, AsyncWrappingCommonArgs async)
326326
{
@@ -352,7 +352,7 @@ public override void EnlistTransaction(System.Transactions.Transaction transacti
352352

353353
#region Database Schema Methods
354354

355-
public override DataTable GetSchema() => GetSchemaImpl(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
355+
public override DataTable GetSchema() => GetSchemaImpl(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
356356
#if NET48 || NETSTANDARD2_0 || NETSTANDARD2_1
357357
public Task<DataTable> GetSchemaAsync(CancellationToken cancellationToken = default)
358358
#else
@@ -364,7 +364,7 @@ private Task<DataTable> GetSchemaImpl(AsyncWrappingCommonArgs async)
364364
return GetSchemaImpl("MetaDataCollections", async);
365365
}
366366

367-
public override DataTable GetSchema(string collectionName) => GetSchemaImpl(collectionName, new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
367+
public override DataTable GetSchema(string collectionName) => GetSchemaImpl(collectionName, AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
368368
#if NET48 || NETSTANDARD2_0 || NETSTANDARD2_1
369369
public Task<DataTable> GetSchemaAsync(string collectionName, CancellationToken cancellationToken = default)
370370
#else
@@ -375,7 +375,7 @@ private Task<DataTable> GetSchemaImpl(string collectionName, AsyncWrappingCommon
375375
{
376376
return GetSchemaImpl(collectionName, null, async);
377377
}
378-
public override DataTable GetSchema(string collectionName, string[] restrictions) => GetSchemaImpl(collectionName, restrictions, new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
378+
public override DataTable GetSchema(string collectionName, string[] restrictions) => GetSchemaImpl(collectionName, restrictions, AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
379379
#if NET48 || NETSTANDARD2_0 || NETSTANDARD2_1
380380
public Task<DataTable> GetSchemaAsync(string collectionName, string[] restrictions, CancellationToken cancellationToken = default)
381381
#else
@@ -403,7 +403,7 @@ protected override DbCommand CreateDbCommand()
403403
return new FbCommand(null, this);
404404
}
405405

406-
public override void ChangeDatabase(string db) => ChangeDatabaseImpl(db, new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
406+
public override void ChangeDatabase(string db) => ChangeDatabaseImpl(db, AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
407407
#if NET48 || NETSTANDARD2_0
408408
public Task ChangeDatabaseAsync(string db, CancellationToken cancellationToken = default)
409409
#else
@@ -441,7 +441,7 @@ private async Task ChangeDatabaseImpl(string db, AsyncWrappingCommonArgs async)
441441
}
442442
}
443443

444-
public override void Open() => OpenImpl(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
444+
public override void Open() => OpenImpl(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
445445
public override Task OpenAsync(CancellationToken cancellationToken) => OpenImpl(new AsyncWrappingCommonArgs(true, cancellationToken));
446446
internal async Task OpenImpl(AsyncWrappingCommonArgs async)
447447
{
@@ -533,7 +533,7 @@ internal async Task OpenImpl(AsyncWrappingCommonArgs async)
533533
}
534534
}
535535

536-
public override void Close() => CloseImpl(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
536+
public override void Close() => CloseImpl(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
537537
#if NET48 || NETSTANDARD2_0
538538
public Task CloseAsync()
539539
#else
@@ -624,7 +624,7 @@ private void OnStateChange(ConnectionState originalState, ConnectionState curren
624624
#endregion
625625

626626
#region Cancelation
627-
public void EnableCancel() => EnableCancelImpl(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
627+
public void EnableCancel() => EnableCancelImpl(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
628628
public Task EnableCancelAsync(CancellationToken cancellationToken = default) => EnableCancelImpl(new AsyncWrappingCommonArgs(true, cancellationToken));
629629
private Task EnableCancelImpl(AsyncWrappingCommonArgs async)
630630
{
@@ -633,7 +633,7 @@ private Task EnableCancelImpl(AsyncWrappingCommonArgs async)
633633
return _innerConnection.EnableCancel(async);
634634
}
635635

636-
public void DisableCancel() => DisableCancelImpl(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
636+
public void DisableCancel() => DisableCancelImpl(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
637637
public Task DisableCancelAsync(CancellationToken cancellationToken = default) => DisableCancelImpl(new AsyncWrappingCommonArgs(true, cancellationToken));
638638
private Task DisableCancelImpl(AsyncWrappingCommonArgs async)
639639
{
@@ -642,7 +642,7 @@ private Task DisableCancelImpl(AsyncWrappingCommonArgs async)
642642
return _innerConnection.DisableCancel(async);
643643
}
644644

645-
public void CancelCommand() => CancelCommandImpl(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
645+
public void CancelCommand() => CancelCommandImpl(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
646646
public Task CancelCommandAsync(CancellationToken cancellationToken = default) => CancelCommandImpl(new AsyncWrappingCommonArgs(true, cancellationToken));
647647
private Task CancelCommandImpl(AsyncWrappingCommonArgs async)
648648
{

‎Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnectionPoolManager.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public void PrunePool()
118118
keep = keep.Concat(available.Except(keep).OrderByDescending(x => x.Created).Take(_connectionString.MinPoolSize - keepCount)).ToList();
119119
}
120120
var release = available.Except(keep).ToList();
121-
Parallel.ForEach(release, x => x.Release(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult());
121+
Parallel.ForEach(release, x => x.Release(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult());
122122
_available = new Stack<Item>(keep);
123123
}
124124
}
@@ -136,7 +136,7 @@ public void ClearPool()
136136

137137
void CleanConnectionsImpl()
138138
{
139-
Parallel.ForEach(_available, x => x.Release(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult());
139+
Parallel.ForEach(_available, x => x.Release(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult());
140140
}
141141

142142
[MethodImpl(MethodImplOptions.AggressiveInlining)]

‎Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbDataReader.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public override int VisibleFieldCount
138138

139139
#region DbDataReader overriden methods
140140

141-
public override void Close() => CloseImpl(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
141+
public override void Close() => CloseImpl(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
142142
#if NET48 || NETSTANDARD2_0
143143
public Task CloseAsync()
144144
#else
@@ -190,7 +190,7 @@ public override async ValueTask DisposeAsync()
190190
}
191191
#endif
192192

193-
public override bool Read() => ReadImpl(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
193+
public override bool Read() => ReadImpl(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
194194
public override Task<bool> ReadAsync(CancellationToken cancellationToken) => ReadImpl(new AsyncWrappingCommonArgs(true, cancellationToken));
195195
private async Task<bool> ReadImpl(AsyncWrappingCommonArgs async)
196196
{
@@ -228,7 +228,7 @@ private async Task<bool> ReadImpl(AsyncWrappingCommonArgs async)
228228
return retValue;
229229
}
230230

231-
public override DataTable GetSchemaTable() => GetSchemaTableImpl(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
231+
public override DataTable GetSchemaTable() => GetSchemaTableImpl(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
232232
#if NET48 || NETSTANDARD2_0 || NETSTANDARD2_1
233233
public Task<DataTable> GetSchemaTableAsync(CancellationToken cancellationToken = default)
234234
#else
@@ -653,7 +653,7 @@ public override DateTime GetDateTime(int i)
653653
return CheckedGetValue(_row[i].GetDateTime);
654654
}
655655

656-
public override bool IsDBNull(int i) => IsDBNullImpl(i, new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
656+
public override bool IsDBNull(int i) => IsDBNullImpl(i, AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
657657
public override Task<bool> IsDBNullAsync(int i, CancellationToken cancellationToken) => IsDBNullImpl(i, new AsyncWrappingCommonArgs(true, cancellationToken));
658658
private async Task<bool> IsDBNullImpl(int i, AsyncWrappingCommonArgs async)
659659
{
@@ -669,7 +669,7 @@ public override IEnumerator GetEnumerator()
669669
return new DbEnumerator(this, IsCommandBehavior(CommandBehavior.CloseConnection));
670670
}
671671

672-
public override bool NextResult() => NextResultImpl(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
672+
public override bool NextResult() => NextResultImpl(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
673673
public override Task<bool> NextResultAsync(CancellationToken cancellationToken) => NextResultImpl(new AsyncWrappingCommonArgs(true, cancellationToken));
674674
private Task<bool> NextResultImpl(AsyncWrappingCommonArgs async)
675675
{
@@ -830,7 +830,7 @@ private static T CheckedGetValue<T>(Func<AsyncWrappingCommonArgs, ValueTask<T>>
830830
{
831831
try
832832
{
833-
return getter(new AsyncWrappingCommonArgs(false)).GetAwaiter().GetResult();
833+
return getter(AsyncWrappingCommonArgs.Sync).GetAwaiter().GetResult();
834834
}
835835
catch (IscException ex)
836836
{

0 commit comments

Comments
 (0)