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:36 UTC
[17/38] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-4768' into ignite-4768-1
Merge remote-tracking branch 'remotes/origin/ignite-4768' into ignite-4768-1
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e1961ff6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e1961ff6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e1961ff6
Branch: refs/heads/ignite-4768
Commit: e1961ff620d8f73469101da96eccda9ed2eddc99
Parents: 5596e69 eeb10b8
Author: sboikov <sb...@gridgain.com>
Authored: Fri Mar 10 13:09:28 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Mar 10 13:09:28 2017 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheMessage.java | 11 +++++++++++
.../processors/cache/KeyCacheObjectImpl.java | 9 +++++++++
.../GridDistributedTxPrepareRequest.java | 16 ++++++++++++++++
.../distributed/dht/GridDhtTxPrepareFuture.java | 20 +++++++++++++-------
.../dht/GridDhtTxPrepareRequest.java | 12 ++++++------
.../dht/GridDhtTxPrepareResponse.java | 16 ++++++++--------
.../distributed/near/GridNearLockFuture.java | 2 ++
...arOptimisticSerializableTxPrepareFuture.java | 8 ++++----
.../near/GridNearOptimisticTxPrepareFuture.java | 1 -
.../near/GridNearTxPrepareRequest.java | 17 ++++++++++++++++-
10 files changed, 85 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1961ff6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1961ff6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 454c8fb,735653d..a787f5f
--- 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
@@@ -1272,13 -1259,9 +1276,13 @@@ public final class GridDhtTxPrepareFutu
if (tx.remainingTime() == -1)
return;
- MiniFuture fut = new MiniFuture(n.id(), ++miniId, dhtMapping, nearMapping);
+ MiniFuture fut = null;
- add(fut); // Append new future.
+ if (!tx.dhtReplyNear()) {
- fut = new MiniFuture(n.id(), dhtMapping, nearMapping);
++ fut = new MiniFuture(n.id(), ++miniId, dhtMapping, nearMapping);
+
+ add(fut); // Append new future.
+ }
assert txNodes != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1961ff6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index fe2d293,8898803..85a65a8
--- 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
@@@ -59,14 -59,8 +59,14 @@@ public class GridDhtTxPrepareRequest ex
private IgniteUuid futId;
/** Mini future ID. */
- private IgniteUuid miniId;
+ private int miniId;
+ /** Future ID. */
+ private IgniteUuid nearFutId;
+
+ /** Mini future ID. */
+ private int nearMiniId;
+
/** Topology version. */
private AffinityTopologyVersion topVer;
@@@ -128,9 -120,7 +128,9 @@@
*/
public GridDhtTxPrepareRequest(
IgniteUuid futId,
- IgniteUuid miniId,
+ int miniId,
+ IgniteUuid nearFutId,
+ int nearMiniId,
AffinityTopologyVersion topVer,
GridDhtTxLocalAdapter tx,
long timeout,
@@@ -156,8 -144,8 +156,8 @@@
onePhaseCommit,
addDepInfo);
- assert dhtNearReply || (futId != null && miniId != null);
- assert futId != null;
- assert miniId != 0;
++ assert dhtNearReply || (futId != null && miniId != 0);
+ assert !dhtNearReply || (nearFutId != null && nearMiniId != 0);
this.topVer = topVer;
this.futId = futId;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1961ff6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
index c37ac80,416540a..cb10374
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
@@@ -85,16 -81,11 +85,16 @@@ public class GridDhtTxPrepareResponse e
* @param miniId Mini future ID.
* @param addDepInfo Deployment info flag.
*/
- public GridDhtTxPrepareResponse(GridCacheVersion xid, IgniteUuid futId, int miniId, boolean addDepInfo) {
- super(xid, addDepInfo);
+ public GridDhtTxPrepareResponse(
+ int part,
+ GridCacheVersion xid,
+ IgniteUuid futId,
- IgniteUuid miniId,
++ int miniId,
+ boolean addDepInfo) {
+ super(part, xid, addDepInfo);
assert futId != null;
- assert miniId != null;
+ assert miniId != 0;
this.futId = futId;
this.miniId = miniId;
@@@ -108,17 -98,12 +108,17 @@@
* @param err Error.
* @param addDepInfo Deployment enabled.
*/
- public GridDhtTxPrepareResponse(GridCacheVersion xid, IgniteUuid futId, int miniId, Throwable err,
+ public GridDhtTxPrepareResponse(
+ int part,
+ GridCacheVersion xid,
+ IgniteUuid futId,
- IgniteUuid miniId,
++ int miniId,
+ Throwable err,
boolean addDepInfo) {
- super(xid, err, addDepInfo);
+ super(part, xid, err, addDepInfo);
assert futId != null;
- assert miniId != null;
+ assert miniId != 0;
this.futId = futId;
this.miniId = miniId;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1961ff6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1961ff6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1961ff6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
----------------------------------------------------------------------