You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/03/14 08:00:31 UTC
[12/38] ignite git commit: ignite-4768
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/784b171d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/784b171d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/784b171d
Branch: refs/heads/ignite-4768
Commit: 784b171deefbc573e7ec6b59128a274acc307946
Parents: 35dad8f
Author: sboikov <sb...@gridgain.com>
Authored: Thu Mar 9 15:45:55 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Mar 9 15:49:52 2017 +0300
----------------------------------------------------------------------
.../cache/distributed/GridDistributedTxPrepareRequest.java | 9 ---------
.../cache/distributed/dht/GridDhtTxPrepareFuture.java | 2 --
.../cache/distributed/dht/GridDhtTxPrepareRequest.java | 2 --
.../cache/distributed/near/GridNearLockFuture.java | 2 ++
.../near/GridNearOptimisticSerializableTxPrepareFuture.java | 1 -
.../distributed/near/GridNearOptimisticTxPrepareFuture.java | 1 -
.../near/GridNearPessimisticTxPrepareFuture.java | 9 ---------
.../cache/distributed/near/GridNearTxPrepareRequest.java | 2 --
8 files changed, 2 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/784b171d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
index e30c456..329dc8b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
@@ -74,9 +74,6 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
/** */
private static final int SYSTEM_TX_FLAG_MASK = 0x10;
- /** */
- private static final int MAPPING_KNOWN_FLAG_MASK = 0x20;
-
/** Collection to message converter. */
private static final C1<Collection<UUID>, UUIDCollectionMessage> COL_TO_MSG = new C1<Collection<UUID>, UUIDCollectionMessage>() {
@Override public UUIDCollectionMessage apply(Collection<UUID> uuids) {
@@ -177,7 +174,6 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
@Nullable Collection<IgniteTxEntry> reads,
Collection<IgniteTxEntry> writes,
Map<UUID, Collection<UUID>> txNodes,
- boolean mappingKnown,
boolean retVal,
boolean last,
boolean onePhaseCommit,
@@ -202,11 +198,6 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
setFlag(tx.isInvalidate(), INVALIDATE_FLAG_MASK);
setFlag(onePhaseCommit, ONE_PHASE_COMMIT_FLAG_MASK);
setFlag(last, LAST_REQ_FLAG_MASK);
- setFlag(mappingKnown, MAPPING_KNOWN_FLAG_MASK);
- }
-
- public final boolean mappingKnown() {
- return isFlag(MAPPING_KNOWN_FLAG_MASK);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/784b171d/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 053c3b2..d093b4a 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
@@ -1273,7 +1273,6 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
nearWrites,
txNodes,
tx.nearXidVersion(),
- false,
true,
tx.onePhaseCommit(),
tx.subjectId(),
@@ -1386,7 +1385,6 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
nearMapping.writes(),
tx.transactionNodes(),
tx.nearXidVersion(),
- false,
true,
tx.onePhaseCommit(),
tx.subjectId(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/784b171d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index e55d189..8c01302 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
@@ -128,7 +128,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
Collection<IgniteTxEntry> nearWrites,
Map<UUID, Collection<UUID>> txNodes,
GridCacheVersion nearXidVer,
- boolean mappingKnown,
boolean last,
boolean onePhaseCommit,
UUID subjId,
@@ -140,7 +139,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
null,
dhtWrites,
txNodes,
- mappingKnown,
retVal,
last,
onePhaseCommit,
http://git-wip-us.apache.org/repos/asf/ignite/blob/784b171d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
index 7b19884..ffc84d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
@@ -1181,6 +1181,8 @@ public final class GridNearLockFuture extends GridCompoundIdentityFuture<Boolean
req.filter(filter, cctx);
if (node.isLocal()) {
+ req.miniId(-1);
+
if (log.isDebugEnabled())
log.debug("Before locally locking near request: " + req);
http://git-wip-us.apache.org/repos/asf/ignite/blob/784b171d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
index bb1609d..f8e0584 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
@@ -442,7 +442,6 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
m.writes(),
m.near(),
txMapping.transactionNodes(),
- false,
m.last(),
tx.onePhaseCommit(),
tx.needReturnValue() && tx.implicit(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/784b171d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index 8bb79c1..4233002 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@ -500,7 +500,6 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
m.writes(),
m.near(),
txMapping.transactionNodes(),
- false,
m.last(),
tx.onePhaseCommit(),
tx.needReturnValue() && tx.implicit(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/784b171d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
index fb2c2fd..ddee7b7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
@@ -184,8 +184,6 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
*
*/
private void preparePessimistic() {
- boolean mappingKnown = true;
-
Map<IgniteBiTuple<ClusterNode, Boolean>, GridDistributedTxMapping> mappings = new HashMap<>();
AffinityTopologyVersion topVer = tx.topologyVersion();
@@ -202,9 +200,6 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
if (!cacheCtx.isLocal()) {
GridDhtPartitionTopology top = cacheCtx.topology();
- if (mappingKnown && (!top.rebalanceFinished(topVer) || cctx.discovery().hasNearCache(cacheCtx.cacheId(), topVer)))
- mappingKnown = false;
-
nodes = cacheCtx.topology().nodes(cacheCtx.affinity().partition(txEntry.key()), topVer);
}
else
@@ -237,9 +232,6 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
checkOnePhase(txMapping);
- if (mappingKnown && tx.onePhaseCommit())
- mappingKnown = false;
-
long timeout = tx.remainingTime();
if (timeout == -1) {
@@ -262,7 +254,6 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
m.writes(),
m.near(),
txMapping.transactionNodes(),
- mappingKnown,
true,
tx.onePhaseCommit(),
tx.needReturnValue() && tx.implicit(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/784b171d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
index 3eff9e5..cccc7b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
@@ -107,7 +107,6 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
Collection<IgniteTxEntry> writes,
boolean near,
Map<UUID, Collection<UUID>> txNodes,
- boolean mappingKnown,
boolean last,
boolean onePhaseCommit,
boolean retVal,
@@ -123,7 +122,6 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
reads,
writes,
txNodes,
- mappingKnown,
retVal,
last,
onePhaseCommit,