Repository: ignite Updated Branches: refs/heads/ignite-1607 5993d2694 -> 7352e2e9e
ignite-1607 WIP Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7352e2e9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7352e2e9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7352e2e9 Branch: refs/heads/ignite-1607 Commit: 7352e2e9ef58bc2fef76776f2c57c4f5df300ca7 Parents: 5993d26 Author: sboikov <[email protected]> Authored: Fri Oct 16 15:47:22 2015 +0300 Committer: sboikov <[email protected]> Committed: Fri Oct 16 15:47:22 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/local/GridLocalCacheEntry.java | 9 ++++++++- .../processors/cache/local/GridLocalLockFuture.java | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7352e2e9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java index 39d4201..24cd2c0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java @@ -67,6 +67,7 @@ public class GridLocalCacheEntry extends GridCacheMapEntry { * * @param threadId Owning thread ID. * @param ver Lock version. + * @param serOrder Version for serializable transactions ordering. * @param serReadVer Optional read entry version for optimistic serializable transaction. * @param timeout Timeout to acquire lock. * @param reenter Reentry flag. @@ -78,6 +79,7 @@ public class GridLocalCacheEntry extends GridCacheMapEntry { @Nullable public GridCacheMvccCandidate addLocal( long threadId, GridCacheVersion ver, + @Nullable GridCacheVersion serOrder, @Nullable GridCacheVersion serReadVer, long timeout, boolean reenter, @@ -110,12 +112,16 @@ public class GridLocalCacheEntry extends GridCacheMapEntry { cand = mvcc.addLocal( this, + /*nearNodeId*/null, + /*nearVer*/null, threadId, ver, timeout, + serOrder, reenter, tx, - implicitSingle + implicitSingle, + /*dht-local*/false ); owner = mvcc.localOwner(); @@ -205,6 +211,7 @@ public class GridLocalCacheEntry extends GridCacheMapEntry { GridCacheMvccCandidate cand = addLocal( tx.threadId(), tx.xidVersion(), + (tx.optimistic() && tx.serializable()) ? tx.nearXidVersion() : null, serReadVer, timeout, /*reenter*/false, http://git-wip-us.apache.org/repos/asf/ignite/blob/7352e2e9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java index b865255..cb14b4c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java @@ -226,6 +226,7 @@ public final class GridLocalLockFuture<K, V> extends GridFutureAdapter<Boolean> threadId, lockVer, null, + null, timeout, !inTx(), inTx(),
