Skip to content

Commit 8a921c2

Browse files
pl752pl752
committed
Adjusted code style
1 parent c058fc5 commit 8a921c2

File tree

13 files changed

+134
-108
lines changed

13 files changed

+134
-108
lines changed

‎src/FirebirdSql.Data.FirebirdClient/Client/Managed/AuthBlock.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public AuthBlock(GdsConnection connection, string user, string password, WireCry
6666
WireCrypt = wireCrypt;
6767
}
6868

69-
public byte[] UserIdentificationData()
69+
public byte[] UserIdentificationData()
7070
{
7171
using (var result = new MemoryStream(256))
7272
{

‎src/FirebirdSql.Data.FirebirdClient/Client/Managed/FirebirdNetworkHandlingWrapper.cs‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,21 +90,27 @@ public int Read(byte[] buffer, int offset, int count)
9090

9191
public int Read(Span<byte> buffer, int offset, int count)
9292
{
93-
if (_inputBuffer.Count < count) {
93+
if (_inputBuffer.Count < count)
94+
{
9495
var readBuffer = _readBuffer;
9596
int read;
96-
try {
97+
try
98+
{
9799
read = _dataProvider.Read(readBuffer, 0, readBuffer.Length);
98100
}
99-
catch (IOException) {
101+
catch (IOException)
102+
{
100103
IOFailed = true;
101104
throw;
102105
}
103-
if (read != 0) {
104-
if (_decryptor != null) {
106+
if (read != 0)
107+
{
108+
if (_decryptor != null)
109+
{
105110
_decryptor.ProcessBytes(readBuffer, 0, read, readBuffer, 0);
106111
}
107-
if (_decompressor != null) {
112+
if (_decompressor != null)
113+
{
108114
read = HandleDecompression(readBuffer, read);
109115
readBuffer = _compressionBuffer;
110116
}
@@ -182,7 +188,7 @@ public ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, int offset, int count,
182188
var span = buffer.Span.Slice(offset, count);
183189
foreach (var b in span)
184190
_outputBuffer.Enqueue(b);
185-
return ValueTask2.CompletedTask;
191+
return ValueTask.CompletedTask;
186192
}
187193

188194
public void Flush()

‎src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsArray.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,10 @@ public override async ValueTask PutSliceAsync(Array sourceArray, int sliceLength
191191

192192
protected override Array DecodeSlice(byte[] slice)
193193
{
194-
var systemType = GetSystemType();
194+
var systemType = GetSystemType();
195195
var lengths = new int[Descriptor.Dimensions];
196196
var lowerBounds = new int[Descriptor.Dimensions];
197-
var index = 0;
197+
var index = 0;
198198

199199
for (var i = 0; i < Descriptor.Dimensions; i++)
200200
{
@@ -213,7 +213,7 @@ protected override Array DecodeSlice(byte[] slice)
213213
int type = TypeHelper.GetSqlTypeFromBlrType(Descriptor.DataType);
214214
DbDataType dbType = TypeHelper.GetDbDataTypeFromBlrType(Descriptor.DataType, 0, Descriptor.Scale);
215215

216-
using (var ms = new MemoryStream(slice))
216+
using (var ms = new MemoryStream(slice))
217217
{
218218
var xdr = new XdrReaderWriter(new DataProviderStreamWrapper(ms), _database.Charset);
219219
while (ms.Position < ms.Length)
@@ -284,10 +284,10 @@ protected override Array DecodeSlice(byte[] slice)
284284
}
285285
protected override async ValueTask<Array> DecodeSliceAsync(byte[] slice, CancellationToken cancellationToken = default)
286286
{
287-
var systemType = GetSystemType();
287+
var systemType = GetSystemType();
288288
var lengths = new int[Descriptor.Dimensions];
289289
var lowerBounds = new int[Descriptor.Dimensions];
290-
var index = 0;
290+
var index = 0;
291291

292292
for (var i = 0; i < Descriptor.Dimensions; i++)
293293
{
@@ -306,7 +306,7 @@ protected override async ValueTask<Array> DecodeSliceAsync(byte[] slice, Cancell
306306
int type = TypeHelper.GetSqlTypeFromBlrType(Descriptor.DataType);
307307
DbDataType dbType = TypeHelper.GetDbDataTypeFromBlrType(Descriptor.DataType, 0, Descriptor.Scale);
308308

309-
using (var ms = new MemoryStream(slice))
309+
using (var ms = new MemoryStream(slice))
310310
{
311311
var xdr = new XdrReaderWriter(new DataProviderStreamWrapper(ms), _database.Charset);
312312
while (ms.Position < ms.Length)
@@ -532,16 +532,16 @@ private async ValueTask<byte[]> ReceiveSliceResponseAsync(ArrayDesc desc, Cancel
532532

533533
private byte[] EncodeSliceArray(Array sourceArray)
534534
{
535-
var charset = _database.Charset;
535+
var charset = _database.Charset;
536536
var subType = (Descriptor.Scale < 0) ? 2 : 0;
537-
using (var ms = new MemoryStream())
537+
using (var ms = new MemoryStream())
538538
{
539539
var xdr = new XdrReaderWriter(new DataProviderStreamWrapper(ms), _database.Charset);
540540

541541
int type = TypeHelper.GetSqlTypeFromBlrType(Descriptor.DataType);
542542
DbDataType dbType = TypeHelper.GetDbDataTypeFromBlrType(Descriptor.DataType, subType, Descriptor.Scale);
543543

544-
foreach (var source in sourceArray)
544+
foreach (var source in sourceArray)
545545
{
546546
switch (dbType)
547547
{
@@ -602,16 +602,16 @@ private byte[] EncodeSliceArray(Array sourceArray)
602602
}
603603
private async ValueTask<byte[]> EncodeSliceArrayAsync(Array sourceArray, CancellationToken cancellationToken = default)
604604
{
605-
var charset = _database.Charset;
605+
var charset = _database.Charset;
606606
var subType = (Descriptor.Scale < 0) ? 2 : 0;
607-
using (var ms = new MemoryStream())
607+
using (var ms = new MemoryStream())
608608
{
609609
var xdr = new XdrReaderWriter(new DataProviderStreamWrapper(ms), _database.Charset);
610610

611611
int type = TypeHelper.GetSqlTypeFromBlrType(Descriptor.DataType);
612612
DbDataType dbType = TypeHelper.GetDbDataTypeFromBlrType(Descriptor.DataType, subType, Descriptor.Scale);
613613

614-
foreach (var source in sourceArray)
614+
foreach (var source in sourceArray)
615615
{
616616
switch (dbType)
617617
{

‎src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsBlob.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ public override void GetSegment(Stream stream)
237237
var srcpos = 0;
238238

239239
while (srcpos < buffer.Length)
240-
{
240+
{
241241
len = (int)IscHelper.VaxInteger(buffer, srcpos, 2);
242242
srcpos += 2;
243243

@@ -286,7 +286,7 @@ public override async ValueTask GetSegmentAsync(Stream stream, CancellationToken
286286
var srcpos = 0;
287287

288288
while (srcpos < buffer.Length)
289-
{
289+
{
290290
len = (int)IscHelper.VaxInteger(buffer, srcpos, 2);
291291
srcpos += 2;
292292

@@ -337,7 +337,7 @@ public override byte[] GetSegment()
337337

338338
var tmp = new byte[requested * 2];
339339
while (posInInput < buffer.Length)
340-
{
340+
{
341341
var len = (int)IscHelper.VaxInteger(buffer, posInInput, 2);
342342
posInInput += 2;
343343

@@ -393,7 +393,7 @@ public override async ValueTask<byte[]> GetSegmentAsync(CancellationToken cancel
393393

394394
var tmp = new byte[requested * 2];
395395
while (posInInput < buffer.Length)
396-
{
396+
{
397397
var len = (int)IscHelper.VaxInteger(buffer, posInInput, 2);
398398
posInInput += 2;
399399

‎src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsDatabase.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ internal class GdsDatabase : DatabaseBase
3232
protected const int PartnerIdentification = 0;
3333
protected const int AddressOfAstRoutine = 0;
3434
protected const int ArgumentToAstRoutine = 0;
35-
protected internal const int DatabaseObjectId = 0;
35+
protected internal const int DatabaseObjectId = 0;
3636
protected internal const int Incarnation = 0;
3737
const int StackallocThreshold = 512;
3838

@@ -73,9 +73,9 @@ public AuthBlock AuthBlock
7373
get { return _connection.AuthBlock; }
7474
}
7575

76-
#endregion
76+
#endregion
7777

78-
#region Constructors
78+
#region Constructors
7979

8080
public GdsDatabase(GdsConnection connection)
8181
: base(connection.Charset, connection.PacketSize, connection.Dialect)
@@ -84,11 +84,11 @@ public GdsDatabase(GdsConnection connection)
8484
_handle = -1;
8585
}
8686

87-
#endregion
87+
#endregion
8888

89-
#region Attach/Detach Methods
89+
#region Attach/Detach Methods
9090

91-
public override void Attach(DatabaseParameterBufferBase dpb, string database, byte[] cryptKey)
91+
public override void Attach(DatabaseParameterBufferBase dpb, string database, byte[] cryptKey)
9292
{
9393
try
9494
{

‎src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsStatement.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ public override void Execute(int timeout, IDescriptorFiller descriptorFiller)
315315
}
316316

317317
var executeResponse = (GenericResponse)_database.ReadResponse();
318-
ProcessExecuteResponse(executeResponse);
318+
ProcessExecuteResponse(executeResponse);
319319

320320
if (DoRecordsAffected)
321321
{
@@ -669,7 +669,7 @@ protected override void Free(int option)
669669
return;
670670

671671
DoFreePacket(option);
672-
ProcessFreeResponse(_database.ReadResponse());
672+
ProcessFreeResponse(_database.ReadResponse());
673673
}
674674
protected override async ValueTask FreeAsync(int option, CancellationToken cancellationToken = default)
675675
{
@@ -1194,14 +1194,14 @@ private Descriptor[] ParseTruncSqlInfoSpan(ReadOnlySpan<byte> info, ReadOnlySpan
11941194

11951195
default:
11961196
throw IscException.ForErrorCode(IscCodes.isc_dsql_sqlda_err);
1197-
}
1198-
}
1199-
// just to get out of the loop
1200-
BreakSpan:
1201-
{ }
12021197
}
1203-
return rowDescs;
1198+
}
1199+
// just to get out of the loop
1200+
BreakSpan:
1201+
{ }
12041202
}
1203+
return rowDescs;
1204+
}
12051205

12061206
private ValueTask<Descriptor[]> ParseTruncSqlInfoAsync(byte[] info, ReadOnlyMemory<byte> items, Descriptor[] rowDescs, CancellationToken cancellationToken) =>
12071207
ParseTruncSqlInfoSpanAsync(info.AsMemory(), items, rowDescs, cancellationToken);
@@ -1351,7 +1351,7 @@ protected virtual byte[] WriteParameters()
13511351
var field = _parameters[i];
13521352
try
13531353
{
1354-
WriteRawParameter(xdr, field);
1354+
WriteRawParameter(xdr, field);
13551355
xdr.Write(field.NullFlag);
13561356
}
13571357
catch (IOException ex)

‎src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version13/GdsStatement.cs‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -151,29 +151,29 @@ protected override DbValue[] ReadRow()
151151
{
152152
if (_fields.Count > 0)
153153
{
154-
var len = (int)Math.Ceiling(_fields.Count / 8d);
155-
var rented = ArrayPool<byte>.Shared.Rent(len);
156-
try
157-
{
158-
_database.Xdr.ReadOpaque(rented.AsSpan(0, len), len);
159-
for (var i = 0; i < _fields.Count; i++)
160-
{
161-
var isNull = (rented[i / 8] & (1 << (i % 8))) != 0;
162-
if (isNull)
163-
{
164-
row[i] = new DbValue(this, _fields[i], null);
165-
}
166-
else
167-
{
168-
var value = ReadRawValue(_database.Xdr, _fields[i]);
169-
row[i] = new DbValue(this, _fields[i], value);
170-
}
171-
}
172-
}
173-
finally
174-
{
175-
ArrayPool<byte>.Shared.Return(rented);
176-
}
154+
var len = (int)Math.Ceiling(_fields.Count / 8d);
155+
var rented = ArrayPool<byte>.Shared.Rent(len);
156+
try
157+
{
158+
_database.Xdr.ReadOpaque(rented.AsSpan(0, len), len);
159+
for (var i = 0; i < _fields.Count; i++)
160+
{
161+
var isNull = (rented[i / 8] & (1 << (i % 8))) != 0;
162+
if (isNull)
163+
{
164+
row[i] = new DbValue(this, _fields[i], null);
165+
}
166+
else
167+
{
168+
var value = ReadRawValue(_database.Xdr, _fields[i]);
169+
row[i] = new DbValue(this, _fields[i], value);
170+
}
171+
}
172+
}
173+
finally
174+
{
175+
ArrayPool<byte>.Shared.Return(rented);
176+
}
177177
}
178178
}
179179
catch (IOException ex)
@@ -189,29 +189,29 @@ protected override async ValueTask<DbValue[]> ReadRowAsync(CancellationToken can
189189
{
190190
if (_fields.Count > 0)
191191
{
192-
var len = (int)Math.Ceiling(_fields.Count / 8d);
193-
var rented = ArrayPool<byte>.Shared.Rent(len);
194-
try
195-
{
196-
await _database.Xdr.ReadOpaqueAsync(rented.AsMemory(0, len), len, cancellationToken).ConfigureAwait(false);
197-
for (var i = 0; i < _fields.Count; i++)
198-
{
199-
var isNull = (rented[i / 8] & (1 << (i % 8))) != 0;
200-
if (isNull)
201-
{
202-
row[i] = new DbValue(this, _fields[i], null);
203-
}
204-
else
205-
{
206-
var value = await ReadRawValueAsync(_database.Xdr, _fields[i], cancellationToken).ConfigureAwait(false);
207-
row[i] = new DbValue(this, _fields[i], value);
208-
}
209-
}
210-
}
211-
finally
212-
{
213-
ArrayPool<byte>.Shared.Return(rented);
214-
}
192+
var len = (int)Math.Ceiling(_fields.Count / 8d);
193+
var rented = ArrayPool<byte>.Shared.Rent(len);
194+
try
195+
{
196+
await _database.Xdr.ReadOpaqueAsync(rented.AsMemory(0, len), len, cancellationToken).ConfigureAwait(false);
197+
for (var i = 0; i < _fields.Count; i++)
198+
{
199+
var isNull = (rented[i / 8] & (1 << (i % 8))) != 0;
200+
if (isNull)
201+
{
202+
row[i] = new DbValue(this, _fields[i], null);
203+
}
204+
else
205+
{
206+
var value = await ReadRawValueAsync(_database.Xdr, _fields[i], cancellationToken).ConfigureAwait(false);
207+
row[i] = new DbValue(this, _fields[i], value);
208+
}
209+
}
210+
}
211+
finally
212+
{
213+
ArrayPool<byte>.Shared.Return(rented);
214+
}
215215
}
216216
}
217217
catch (IOException ex)

‎src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version16/GdsBatch.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ public override async ValueTask<ExecuteResultItem[]> ExecuteAsync(int count, IDe
146146
public override int ComputeBatchSize(int count, IDescriptorFiller descriptorFiller)
147147
{
148148
var total = 0;
149-
for(var i = 0; i < count; i++) {
149+
for(var i = 0; i < count; i++)
150+
{
150151
var item = _statement.GetParameterData(descriptorFiller, i);
151152
total += item.Length;
152153
}
@@ -155,7 +156,8 @@ public override int ComputeBatchSize(int count, IDescriptorFiller descriptorFill
155156
public override async ValueTask<int> ComputeBatchSizeAsync(int count, IDescriptorFiller descriptorFiller, CancellationToken cancellationToken = default)
156157
{
157158
var total = 0;
158-
for(var i = 0; i < count; i++) {
159+
for(var i = 0; i < count; i++)
160+
{
159161
var item = await _statement.GetParameterDataAsync(descriptorFiller, i, cancellationToken).ConfigureAwait(false);
160162
total += item.Length;
161163
}

0 commit comments

Comments
 (0)