Repository: ignite Updated Branches: refs/heads/ignite-perftest-merge 54f943462 -> 4c9afe22b
Ignite-perftest - Fixed assertion. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4c9afe22 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4c9afe22 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4c9afe22 Branch: refs/heads/ignite-perftest-merge Commit: 4c9afe22b6c6ea60dd6491a4b6d146e6e7b8f7f8 Parents: 54f9434 Author: Alexey Goncharuk <[email protected]> Authored: Fri Nov 13 17:40:12 2015 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Fri Nov 13 17:40:12 2015 +0300 ---------------------------------------------------------------------- .../distributed/near/GridNearTxPrepareFutureAdapter.java | 3 +-- .../processors/cache/transactions/IgniteTxEntry.java | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4c9afe22/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java index 1db8a6c..0ddd00a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java @@ -231,13 +231,12 @@ public abstract class GridNearTxPrepareFutureAdapter extends GridCompoundFuture< if (writeVer == null) writeVer = res.dhtVersion(); - assert tx.mappings().get(nodeId) == m; - // This step is very important as near and DHT versions grow separately. cctx.versions().onReceived(nodeId, res.dhtVersion()); // Register DHT version. m.dhtVersion(res.dhtVersion(), writeVer); + tx.mappings().get(nodeId).dhtVersion(res.dhtVersion(), writeVer); if (m.near()) tx.readyNearLocks(m, res.pending(), res.committedVersions(), res.rolledbackVersions()); http://git-wip-us.apache.org/repos/asf/ignite/blob/4c9afe22/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java index 9eb2808..23f83be 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java @@ -599,20 +599,20 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message { */ @SuppressWarnings("unchecked") public CacheObject applyEntryProcessors(CacheObject cacheVal) { - Object val = null; - Object keyVal = null; - GridCacheVersion ver; try { ver = entry.version(); } - catch (GridCacheEntryRemovedException e) { + catch (GridCacheEntryRemovedException ignore) { assert tx == null || tx.optimistic() : tx; ver = null; } + Object val = null; + Object keyVal = null; + for (T2<EntryProcessor<Object, Object, Object>, Object[]> t : entryProcessors()) { try { CacheInvokeEntry<Object, Object> invokeEntry = new CacheInvokeEntry(ctx, key, keyVal, cacheVal, val, @@ -1078,5 +1078,4 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message { @Override public String toString() { return GridToStringBuilder.toString(IgniteTxEntry.class, this, "xidVer", tx == null ? "null" : tx.xidVersion()); } - }
