Skip to content

IGNITE-27455 Remove byte fields for enums in GridDistributedTxPrepareRequest #12607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wernerdv wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −34
Open

IGNITE-27455 Remove byte fields for enums in GridDistributedTxPrepareRequest #12607

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 8 additions & 34 deletions .../apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,21 +80,15 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
private long threadId;

/** Transaction concurrency. */
@Order(8)
@GridToStringInclude
private TransactionConcurrency concurrency;

/** Transaction concurrency ordinal. */
@Order(value = 8, method = "concurrencyOrdinal")
private byte concurrencyOrd;

/** Transaction isolation. */
@Order(9)
@GridToStringInclude
private TransactionIsolation isolation;

/** Transaction isolation ordinal. */
@Order(value = 9, method = "isolationOrdinal")
private byte isolationOrd;

/** Commit version for EC transactions. */
@Order(value = 10, method = "writeVersion")
@GridToStringInclude
Expand Down Expand Up @@ -188,9 +182,7 @@ public GridDistributedTxPrepareRequest(
writeVer = tx.writeVersion();
threadId = tx.threadId();
concurrency = tx.concurrency();
concurrencyOrd = concurrency != null ? (byte)concurrency.ordinal() : -1;
isolation = tx.isolation();
isolationOrd = isolation != null ? (byte)isolation.ordinal() : -1;
txSize = tx.size();
plc = tx.ioPolicy();

Expand Down Expand Up @@ -342,19 +334,10 @@ public TransactionConcurrency concurrency() {
}

/**
* @return Concurrency ordinal.
*/
public byte concurrencyOrdinal() {
return concurrencyOrd;
}

/**
* @param concurrencyOrd Concurrency ordinal.
* @param concurrency Concurrency.
*/
public void concurrencyOrdinal(byte concurrencyOrd) {
this.concurrencyOrd = concurrencyOrd;

concurrency = TransactionConcurrency.fromOrdinal(concurrencyOrd);
public void concurrency(TransactionConcurrency concurrency) {
this.concurrency = concurrency;
}

/**
Expand All @@ -365,19 +348,10 @@ public TransactionIsolation isolation() {
}

/**
* @return Isolation level ordinal.
*/
public byte isolationOrdinal() {
return isolationOrd;
}

/**
* @param isolationOrd Isolation level ordinal.
* @param isolation Isolation level.
*/
public void isolationOrdinal(byte isolationOrd) {
this.isolationOrd = isolationOrd;

isolation = TransactionIsolation.fromOrdinal(isolationOrd);
public void isolation(TransactionIsolation isolation) {
this.isolation = isolation;
}

/**
Expand Down