Skip to content

IGNITE-28357 Remove redundant collections conversion logic from TxLocksResponse #12951

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
Open

IGNITE-28357 Remove redundant collections conversion logic from TxLocksResponse #12951

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
66 changes: 10 additions & 56 deletions ...c/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,8 @@
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.processors.cache.GridCacheMessage;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;

/**
* Transactions lock list response.
Expand All @@ -41,27 +39,14 @@ public class TxLocksResponse extends GridCacheMessage {
long futId;

/** Locks for near txKeys of near transactions. */
@Order(1)
@GridToStringInclude
private final Map<IgniteTxKey, List<TxLock>> nearTxKeyLocks = new HashMap<>();
Map<IgniteTxKey, List<TxLock>> nearTxKeyLocks = new HashMap<>();

/** Remote keys involved into transactions. Doesn't include near keys. */
@GridToStringInclude
private Set<IgniteTxKey> txKeys;

/** Array of txKeys from {@link #nearTxKeyLocks}. Used during marshalling and unmarshalling. */
@GridToStringExclude
@Order(1)
IgniteTxKey[] nearTxKeysArr;

/** Array of txKeys from {@link #txKeys}. Used during marshalling and unmarshalling. */
@GridToStringExclude
@Order(2)
IgniteTxKey[] txKeysArr;

/** Array of locksArr from {@link #nearTxKeyLocks}. Used during marshalling and unmarshalling. */
@GridToStringExclude
@Order(3)
List<TxLock>[] locksArr;
@GridToStringInclude
Set<IgniteTxKey> txKeys;

/**
* Default constructor.
Expand Down Expand Up @@ -141,35 +126,16 @@ public void addKey(IgniteTxKey key) {
super.prepareMarshal(ctx);

if (nearTxKeyLocks != null && !nearTxKeyLocks.isEmpty()) {
int len = nearTxKeyLocks.size();

nearTxKeysArr = new IgniteTxKey[len];
locksArr = (List<TxLock>[])new List[len];

int i = 0;

for (Map.Entry<IgniteTxKey, List<TxLock>> entry : nearTxKeyLocks.entrySet()) {
IgniteTxKey key = entry.getKey();

key.prepareMarshal(ctx.cacheContext(key.cacheId()));

nearTxKeysArr[i] = key;
locksArr[i] = entry.getValue();

i++;
}
}

if (txKeys != null && !txKeys.isEmpty()) {
txKeysArr = new IgniteTxKey[txKeys.size()];

int i = 0;

for (IgniteTxKey key : txKeys) {
for (IgniteTxKey key : txKeys)
key.prepareMarshal(ctx.cacheContext(key.cacheId()));

txKeysArr[i++] = key;
}
}
}

Expand All @@ -178,29 +144,17 @@ public void addKey(IgniteTxKey key) {
try {
super.finishUnmarshal(ctx, ldr);

if (nearTxKeysArr != null) {
for (int i = 0; i < nearTxKeysArr.length; i++) {
IgniteTxKey txKey = nearTxKeysArr[i];
if (nearTxKeyLocks != null && !nearTxKeyLocks.isEmpty()) {
for (Map.Entry<IgniteTxKey, List<TxLock>> entry : nearTxKeyLocks.entrySet()) {
IgniteTxKey txKey = entry.getKey();

txKey.key().finishUnmarshal(ctx.cacheObjectContext(txKey.cacheId()), ldr);

txLocks().put(txKey, locksArr[i]);
}

nearTxKeysArr = null;
locksArr = null;
}

if (txKeysArr != null) {
txKeys = U.newHashSet(txKeysArr.length);

for (IgniteTxKey txKey : txKeysArr) {
if (txKeys != null && !txKeys.isEmpty()) {
for (IgniteTxKey txKey : txKeys)
txKey.key().finishUnmarshal(ctx.cacheObjectContext(txKey.cacheId()), ldr);

txKeys.add(txKey);
}

txKeysArr = null;
}
}
catch (Exception e) {
Expand Down
Loading