Skip to content

Commit a9dc4eb

Browse files
alex-kulakovalex-kulakov
committed
File formatting
1 parent d8d6349 commit a9dc4eb

File tree

1 file changed

+42
-32
lines changed

1 file changed

+42
-32
lines changed

‎Orm/Xtensive.Orm/Orm/Providers/Requests/PersistRequestBuilder.cs‎

Lines changed: 42 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,13 @@ internal ICollection<PersistRequest> Build(StorageNode node, PersistRequestBuild
5555
return new List<PersistRequest> {batchRequest}.AsReadOnly();
5656
}
5757

58-
foreach (var item in result)
58+
foreach (var item in result) {
5959
item.Prepare();
60+
}
6061

6162
return result.AsReadOnly();
6263
}
63-
64+
6465
protected virtual List<PersistRequest> BuildInsertRequest(PersistRequestBuilderContext context)
6566
{
6667
var result = new List<PersistRequest>();
@@ -71,7 +72,7 @@ protected virtual List<PersistRequest> BuildInsertRequest(PersistRequestBuilderC
7172
var bindings = new List<PersistParameterBinding>();
7273

7374
foreach (var column in index.Columns) {
74-
int fieldIndex = GetFieldIndex(context.Type, column);
75+
var fieldIndex = GetFieldIndex(context.Type, column);
7576
if (fieldIndex >= 0) {
7677
var binding = GetBinding(context, column, table, fieldIndex);
7778
query.Values[tableRef[column.Name]] = binding.ParameterReference;
@@ -94,7 +95,7 @@ protected virtual List<PersistRequest> BuildUpdateRequest(PersistRequestBuilderC
9495
var bindings = new List<PersistParameterBinding>();
9596

9697
foreach (var column in index.Columns) {
97-
int fieldIndex = GetFieldIndex(context.Type, column);
98+
var fieldIndex = GetFieldIndex(context.Type, column);
9899
if (fieldIndex >= 0 && context.Task.ChangedFields[fieldIndex]) {
99100
var binding = GetBinding(context, column, table, fieldIndex);
100101
query.Values[tableRef[column.Name]] = binding.ParameterReference;
@@ -112,12 +113,14 @@ protected virtual List<PersistRequest> BuildUpdateRequest(PersistRequestBuilderC
112113
var isValidRequest = hasColumnUpdates
113114
|| requiresVersionValidation && AddFakeVersionColumnUpdate(context, query, tableRef);
114115

115-
if (!isValidRequest)
116+
if (!isValidRequest) {
116117
continue;
118+
}
117119

118120
query.Where = BuildKeyFilter(context, tableRef, bindings);
119-
if (requiresVersionValidation)
121+
if (requiresVersionValidation) {
120122
query.Where &= BuildVersionFilter(context, tableRef, bindings);
123+
}
121124
result.Add(CreatePersistRequest(query, bindings,context.NodeConfiguration));
122125
}
123126

@@ -127,14 +130,15 @@ protected virtual List<PersistRequest> BuildUpdateRequest(PersistRequestBuilderC
127130
protected virtual List<PersistRequest> BuildRemoveRequest(PersistRequestBuilderContext context)
128131
{
129132
var result = new List<PersistRequest>();
130-
for (int i = context.AffectedIndexes.Count - 1; i >= 0; i--) {
133+
for (var i = context.AffectedIndexes.Count - 1; i >= 0; i--) {
131134
var index = context.AffectedIndexes[i];
132135
var tableRef = SqlDml.TableRef(context.Mapping[index.ReflectedType]);
133136
var query = SqlDml.Delete(tableRef);
134137
var bindings = new List<PersistParameterBinding>();
135138
query.Where = BuildKeyFilter(context, tableRef, bindings);
136-
if (context.Task.ValidateVersion)
139+
if (context.Task.ValidateVersion) {
137140
query.Where &= BuildVersionFilter(context, tableRef, bindings);
141+
}
138142
result.Add(CreatePersistRequest(query, bindings, context.NodeConfiguration));
139143
}
140144
return result;
@@ -144,14 +148,13 @@ private SqlExpression BuildKeyFilter(PersistRequestBuilderContext context, SqlTa
144148
{
145149
SqlExpression result = null;
146150
foreach (var column in context.PrimaryIndex.KeyColumns.Keys) {
147-
var fieldIndex = GetFieldIndex(context.Type, column);
148-
PersistParameterBinding binding;
149-
if (!context.ParameterBindings.TryGetValue(column, out binding)) {
151+
if (!context.ParameterBindings.TryGetValue(column, out var binding)) {
150152
var typeMapping = driver.GetTypeMapping(column);
153+
var fieldIndex = GetFieldIndex(context.Type, column);
151154
binding = new PersistParameterBinding(typeMapping, fieldIndex);
152155
context.ParameterBindings.Add(column, binding);
153156
}
154-
result &= filteredTable[column.Name]==binding.ParameterReference;
157+
result &= filteredTable[column.Name] == binding.ParameterReference;
155158
currentBindings.Add(binding);
156159
}
157160
return result;
@@ -162,43 +165,49 @@ private SqlExpression BuildVersionFilter(PersistRequestBuilderContext context, S
162165
SqlExpression result = null;
163166
foreach (var column in context.Type.GetVersionColumns()) {
164167
var fieldIndex = GetFieldIndex(context.Type, column);
165-
if (!context.Task.AvailableFields[fieldIndex])
168+
if (!context.Task.AvailableFields[fieldIndex]) {
166169
continue;
167-
PersistParameterBinding binding;
168-
if (!context.VersionParameterBindings.TryGetValue(column, out binding)) {
170+
}
171+
172+
if (!context.VersionParameterBindings.TryGetValue(column, out var binding)) {
169173
var typeMapping = driver.GetTypeMapping(column);
170174
binding = new PersistParameterBinding(typeMapping, fieldIndex, ParameterTransmissionType.Regular, PersistParameterBindingType.VersionFilter);
171175
context.VersionParameterBindings.Add(column, binding);
172176
}
173177
var filteredColumn = filteredTable[column.Name];
174-
if (filteredColumn.IsNullReference())
178+
if (filteredColumn.IsNullReference()) {
175179
continue;
180+
}
176181
var filterValue = binding.ParameterReference;
177182
// Handle decimal precision issue
178-
if (Type.GetTypeCode(column.ValueType)==TypeCode.Decimal)
183+
if (Type.GetTypeCode(column.ValueType) == TypeCode.Decimal) {
179184
filterValue = SqlDml.Cast(filterValue, driver.MapValueType(column));
180-
result &= SqlDml.Variant(binding, filteredColumn==filterValue, SqlDml.IsNull(filteredColumn));
185+
}
186+
187+
result &= SqlDml.Variant(binding, filteredColumn == filterValue, SqlDml.IsNull(filteredColumn));
181188
currentBindings.Add(binding);
182189
}
183190
return result;
184191
}
185192

186193
protected PersistRequest CreatePersistRequest(SqlStatement query, IEnumerable<PersistParameterBinding> bindings, NodeConfiguration nodeConfiguration)
187194
{
188-
if (Handlers.Domain.Configuration.ShareStorageSchemaOverNodes)
189-
return new PersistRequest(driver, query, bindings, nodeConfiguration);
190-
return new PersistRequest(driver, query, bindings);
195+
return Handlers.Domain.Configuration.ShareStorageSchemaOverNodes
196+
? new PersistRequest(driver, query, bindings, nodeConfiguration)
197+
: new PersistRequest(driver, query, bindings);
191198
}
192199

193200
private bool AddFakeVersionColumnUpdate(PersistRequestBuilderContext context, SqlUpdate update, SqlTableRef filteredTable)
194201
{
195202
foreach (var column in context.Type.GetVersionColumns()) {
196203
var columnExpression = filteredTable[column.Name];
197-
if (columnExpression.IsNullReference())
204+
if (columnExpression.IsNullReference()) {
198205
continue;
199-
int index = GetFieldIndex(context.Type, column);
200-
if (index < 0 || !context.Task.AvailableFields[index])
206+
}
207+
var index = GetFieldIndex(context.Type, column);
208+
if (index < 0 || !context.Task.AvailableFields[index]) {
201209
continue;
210+
}
202211
update.Values.Add(columnExpression, columnExpression);
203212
return true;
204213
}
@@ -207,8 +216,7 @@ private bool AddFakeVersionColumnUpdate(PersistRequestBuilderContext context, Sq
207216

208217
private PersistParameterBinding GetBinding(PersistRequestBuilderContext context, ColumnInfo column, Table table, int fieldIndex)
209218
{
210-
PersistParameterBinding binding;
211-
if (!context.ParameterBindings.TryGetValue(column, out binding)) {
219+
if (!context.ParameterBindings.TryGetValue(column, out var binding)) {
212220
var typeMapping = driver.GetTypeMapping(column);
213221
var bindingType = GetTransmissionType(table.TableColumns[column.Name]);
214222
binding = new PersistParameterBinding(typeMapping, fieldIndex, bindingType);
@@ -219,15 +227,17 @@ private PersistParameterBinding GetBinding(PersistRequestBuilderContext context,
219227

220228
private ParameterTransmissionType GetTransmissionType(TableColumn column)
221229
{
222-
if (!useLargeObjects)
230+
if (!useLargeObjects) {
223231
return ParameterTransmissionType.Regular;
232+
}
224233

225-
if (column.DataType.Type==SqlType.VarCharMax)
234+
if (column.DataType.Type==SqlType.VarCharMax) {
226235
return ParameterTransmissionType.CharacterLob;
236+
}
227237

228-
if (column.DataType.Type==SqlType.VarBinaryMax)
229-
return ParameterTransmissionType.BinaryLob;
230-
return ParameterTransmissionType.Regular;
238+
return column.DataType.Type == SqlType.VarBinaryMax
239+
? ParameterTransmissionType.BinaryLob
240+
: ParameterTransmissionType.Regular;
231241
}
232242

233243
private static int GetFieldIndex(TypeInfo type, ColumnInfo column)
@@ -246,7 +256,7 @@ protected override void Initialize()
246256
providerInfo = Handlers.ProviderInfo;
247257
useLargeObjects = Handlers.ProviderInfo.Supports(ProviderFeatures.LargeObjects);
248258
}
249-
259+
250260
// Constructors
251261

252262
/// <summary>

0 commit comments

Comments
 (0)