Skip to content

Commit 8a2a7ca

Browse files
authored
IGNITE-27455 Remove byte fields for enums in GridDistributedTxPrepareRequest (#12607)
1 parent 63cfb6e commit 8a2a7ca

File tree

1 file changed

+8
-34
lines changed

1 file changed

+8
-34
lines changed

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java

Lines changed: 8 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -80,21 +80,15 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
8080
private long threadId;
8181

8282
/** Transaction concurrency. */
83+
@Order(8)
8384
@GridToStringInclude
8485
private TransactionConcurrency concurrency;
8586

86-
/** Transaction concurrency ordinal. */
87-
@Order(value = 8, method = "concurrencyOrdinal")
88-
private byte concurrencyOrd;
89-
9087
/** Transaction isolation. */
88+
@Order(9)
9189
@GridToStringInclude
9290
private TransactionIsolation isolation;
9391

94-
/** Transaction isolation ordinal. */
95-
@Order(value = 9, method = "isolationOrdinal")
96-
private byte isolationOrd;
97-
9892
/** Commit version for EC transactions. */
9993
@Order(value = 10, method = "writeVersion")
10094
@GridToStringInclude
@@ -188,9 +182,7 @@ public GridDistributedTxPrepareRequest(
188182
writeVer = tx.writeVersion();
189183
threadId = tx.threadId();
190184
concurrency = tx.concurrency();
191-
concurrencyOrd = concurrency != null ? (byte)concurrency.ordinal() : -1;
192185
isolation = tx.isolation();
193-
isolationOrd = isolation != null ? (byte)isolation.ordinal() : -1;
194186
txSize = tx.size();
195187
plc = tx.ioPolicy();
196188

@@ -342,19 +334,10 @@ public TransactionConcurrency concurrency() {
342334
}
343335

344336
/**
345-
* @return Concurrency ordinal.
346-
*/
347-
public byte concurrencyOrdinal() {
348-
return concurrencyOrd;
349-
}
350-
351-
/**
352-
* @param concurrencyOrd Concurrency ordinal.
337+
* @param concurrency Concurrency.
353338
*/
354-
public void concurrencyOrdinal(byte concurrencyOrd) {
355-
this.concurrencyOrd = concurrencyOrd;
356-
357-
concurrency = TransactionConcurrency.fromOrdinal(concurrencyOrd);
339+
public void concurrency(TransactionConcurrency concurrency) {
340+
this.concurrency = concurrency;
358341
}
359342

360343
/**
@@ -365,19 +348,10 @@ public TransactionIsolation isolation() {
365348
}
366349

367350
/**
368-
* @return Isolation level ordinal.
369-
*/
370-
public byte isolationOrdinal() {
371-
return isolationOrd;
372-
}
373-
374-
/**
375-
* @param isolationOrd Isolation level ordinal.
351+
* @param isolation Isolation level.
376352
*/
377-
public void isolationOrdinal(byte isolationOrd) {
378-
this.isolationOrd = isolationOrd;
379-
380-
isolation = TransactionIsolation.fromOrdinal(isolationOrd);
353+
public void isolation(TransactionIsolation isolation) {
354+
this.isolation = isolation;
381355
}
382356

383357
/**

0 commit comments

Comments
 (0)