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:45 UTC
[26/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/dht/GridDhtTxFinishRequest.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.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/GridNearTxFinishFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c4e0ce33
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c4e0ce33
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c4e0ce33
Branch: refs/heads/ignite-4768
Commit: c4e0ce33a278e5fa7a29571180c8145be6e8e6aa
Parents: 2e2d39d
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 13 11:50:43 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 13 11:50:43 2017 +0300
----------------------------------------------------------------------
.../GridDistributedTxFinishResponse.java | 1 -
.../distributed/dht/GridDhtTxFinishResponse.java | 19 ++++++++++++++++++-
.../distributed/near/GridNearTxFinishFuture.java | 2 +-
.../near/GridNearTxFinishResponse.java | 2 +-
4 files changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c4e0ce33/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
index 1f61033..2c446c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.processors.cache.distributed;
-import java.io.Externalizable;
import java.nio.ByteBuffer;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.managers.communication.GridIoMessageFactory;
http://git-wip-us.apache.org/repos/asf/ignite/blob/c4e0ce33/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
index 7648178..5646cb2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
@@ -39,6 +39,9 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
/** */
private static final long serialVersionUID = 0L;
+ /** */
+ private static final int NEAR_RES_FLAG_MASK = 0x01;
+
/** Mini future ID. */
private int miniId;
@@ -68,7 +71,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
* @param miniId Mini future ID.
*/
public GridDhtTxFinishResponse(GridCacheVersion xid, IgniteUuid futId, int miniId) {
- super(xid, futId);
+ super(miniId, xid, futId);
assert miniId != 0;
@@ -76,6 +79,20 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
}
/**
+ * @return {@code True} if this is reply for near node.
+ */
+ public boolean nearNodeResponse() {
+ return isFlag(NEAR_RES_FLAG_MASK);
+ }
+
+ /**
+ * @param val {@code True} if this is reply for near node.
+ */
+ public void nearNodeResponse(boolean val) {
+ setFlag(val, NEAR_RES_FLAG_MASK);
+ }
+
+ /**
* @return Mini future ID.
*/
public int miniId() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/c4e0ce33/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index fc2c3aa..c55d515 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -252,7 +252,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
if (fut.getClass() == FinishMiniFuture.class) {
FinishMiniFuture f = (FinishMiniFuture)fut;
- if (f.futureId().equals(res.miniId())) {
+ if (f.futureId() == res.miniId()) {
foundFut = (MinFuture)fut;
break;
http://git-wip-us.apache.org/repos/asf/ignite/blob/c4e0ce33/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
index e9043ed..96b0778 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
@@ -67,7 +67,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
*/
public GridNearTxFinishResponse(GridCacheVersion xid, long nearThreadId, IgniteUuid futId, int miniId,
@Nullable Throwable err) {
- super(xid, futId);
+ super(miniId, xid, futId);
assert miniId != 0;