You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2015/09/05 01:45:54 UTC
[30/30] ignite git commit: IGNITE-264 - Corrected write version
IGNITE-264 - Corrected write version
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/114387be
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/114387be
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/114387be
Branch: refs/heads/ignite-264
Commit: 114387beab4c52ab7ba82ae78c47eb6b0ddd3721
Parents: acfa611
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri Sep 4 16:43:32 2015 -0700
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Sep 4 16:43:32 2015 -0700
----------------------------------------------------------------------
.../cache/distributed/dht/GridDhtTxPrepareFuture.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/114387be/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index d79b7c1..27b881a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -927,6 +927,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
// We are holding transaction-level locks for entries here, so we can get next write version.
onEntriesLocked();
+ // We are holding transaction-level locks for entries here, so we can get next write version.
tx.writeVersion(cctx.versions().next(tx.topologyVersion()));
{
@@ -949,12 +950,6 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
tx.needsCompletedVersions(hasRemoteNodes);
}
- // We are holding transaction-level locks for entries here, so we can get next write version.
- if (tx.onePhaseCommit())
- tx.writeVersion(tx.nearXidVersion());
- else
- tx.writeVersion(cctx.versions().next(tx.topologyVersion()));
-
if (isDone())
return;