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/11/16 12:54:32 UTC
ignite git commit: Perf - Fixed tests.
Repository: ignite
Updated Branches:
refs/heads/ignite-perftest-merge 96c1b2d10 -> f95450e68
Perf - Fixed tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f95450e6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f95450e6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f95450e6
Branch: refs/heads/ignite-perftest-merge
Commit: f95450e68c9a5d44a7b3e2a4bbd90dfdecf6e8a4
Parents: 96c1b2d
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Mon Nov 16 14:54:19 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon Nov 16 14:54:19 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/near/GridNearTxLocal.java | 23 --------------------
.../near/GridNearTxPrepareFutureAdapter.java | 6 ++++-
2 files changed, 5 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f95450e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index 624b025..5e356d6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -525,29 +525,6 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter {
}
/**
- * Adds keys mapping.
- *
- * @param n Mapped node.
- * @param mappedKeys Mapped keys.
- */
- private void addKeyMapping(ClusterNode n, Iterable<IgniteTxKey> mappedKeys) {
- GridDistributedTxMapping m = mappings.get(n.id());
-
- if (m == null)
- mappings.put(n.id(), m = new GridDistributedTxMapping(n));
-
- for (IgniteTxKey key : mappedKeys) {
- IgniteTxEntry txEntry = txMap.get(key);
-
- assert txEntry != null;
-
- txEntry.nodeId(n.id());
-
- m.add(txEntry);
- }
- }
-
- /**
* Adds mapping to the transaction. Note that transaction must hold a copy of TX mapping because
* tx mapping will be sent to remote nodes.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/f95450e6/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 0ddd00a..cfaadc9 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
@@ -236,7 +236,11 @@ public abstract class GridNearTxPrepareFutureAdapter extends GridCompoundFuture<
// Register DHT version.
m.dhtVersion(res.dhtVersion(), writeVer);
- tx.mappings().get(nodeId).dhtVersion(res.dhtVersion(), writeVer);
+
+ GridDistributedTxMapping map = tx.mappings().get(nodeId);
+
+ if (map != null)
+ map.dhtVersion(res.dhtVersion(), writeVer);
if (m.near())
tx.readyNearLocks(m, res.pending(), res.committedVersions(), res.rolledbackVersions());