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/06/09 13:45:46 UTC
[1/3] ignite git commit: Fixed GridH2IndexRangeRequest serialization.
Repository: ignite
Updated Branches:
refs/heads/ignite-5272-tx c5a6d30f8 -> ab16aa330
Fixed GridH2IndexRangeRequest serialization.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/03ec1075
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/03ec1075
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/03ec1075
Branch: refs/heads/ignite-5272-tx
Commit: 03ec10757f62118753a7bfa02749c21c6eea3d51
Parents: 7ceb201
Author: devozerov <vo...@gridgain.com>
Authored: Fri Jun 9 14:41:52 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Fri Jun 9 14:41:52 2017 +0300
----------------------------------------------------------------------
.../processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/03ec1075/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
index b030632..7024884 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
@@ -174,6 +174,8 @@ public class GridH2IndexRangeRequest implements Message {
if (!writer.writeInt("segmentId", segmentId))
return false;
+ writer.incrementState();
+
case 5:
if (!writer.writeInt("originSegId", originSegmentId))
return false;
[2/3] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-5272-tx
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-5272-tx
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/be2df0a9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/be2df0a9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/be2df0a9
Branch: refs/heads/ignite-5272-tx
Commit: be2df0a9931498c4c740319087865a1f4e687818
Parents: c5a6d30 03ec107
Author: sboikov <sb...@gridgain.com>
Authored: Fri Jun 9 16:00:42 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Jun 9 16:00:42 2017 +0300
----------------------------------------------------------------------
.../processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
[3/3] ignite git commit: ignite-5272 tx
Posted by sb...@apache.org.
ignite-5272 tx
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ab16aa33
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ab16aa33
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ab16aa33
Branch: refs/heads/ignite-5272-tx
Commit: ab16aa330638fff9b8012ab49fedc1e8690f8f92
Parents: be2df0a
Author: sboikov <sb...@gridgain.com>
Authored: Fri Jun 9 16:07:13 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Jun 9 16:45:31 2017 +0300
----------------------------------------------------------------------
.../dht/GridDhtTransactionalCacheAdapter.java | 3 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 7 +++-
.../colocated/GridDhtColocatedLockFuture.java | 43 +++++++++++---------
.../distributed/near/GridNearGetRequest.java | 1 -
.../distributed/near/GridNearLockFuture.java | 1 +
.../distributed/near/GridNearLockRequest.java | 13 +++++-
.../near/GridNearTxPrepareResponse.java | 2 +-
.../cache/transactions/IgniteTxEntry.java | 6 +++
.../cache/transactions/IgniteTxLocalState.java | 3 --
9 files changed, 50 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab16aa33/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
index d607ff1..acba833 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
@@ -1026,7 +1026,8 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
req.createTtl(),
req.accessTtl(),
req.skipStore(),
- req.keepBinary());
+ req.keepBinary(),
+ req.nearCache());
final GridDhtTxLocal t = tx;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab16aa33/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
index 8047bda..c027ab9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
@@ -535,6 +535,8 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter {
* @param accessTtl TTL for read operation.
* @param needRetVal Return value flag.
* @param skipStore Skip store flag.
+ * @param keepBinary Keep binary flag.
+ * @param nearCache {@code True} if near cache enabled on originating node.
* @return Lock future.
*/
@SuppressWarnings("ForLoopReplaceableByForEach")
@@ -547,7 +549,8 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter {
long createTtl,
long accessTtl,
boolean skipStore,
- boolean keepBinary
+ boolean keepBinary,
+ boolean nearCache
) {
try {
checkValid();
@@ -613,7 +616,7 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter {
null,
skipStore,
keepBinary,
- CU.isNearEnabled(cacheCtx));
+ nearCache);
if (read)
txEntry.ttl(accessTtl);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab16aa33/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
index 4442b3a..ccbf272 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
@@ -922,29 +922,32 @@ public final class GridDhtColocatedLockFuture extends GridCacheCompoundIdentityF
first = false;
}
- assert !implicitTx() && !implicitSingleTx() : tx;req = new GridNearLockRequest(
- cctx.cacheId(),
- topVer,
- cctx.nodeId(),
- threadId,
- futId,
- lockVer,
- inTx(),
- read,
- retval,
- isolation(),
- isInvalidate(),
- timeout,
- mappedKeys.size(),
- inTx() ? tx.size() : mappedKeys.size(),
- inTx() && tx.syncMode() == FULL_SYNC,
- inTx() ? tx.subjectId() : null,
- inTx() ? tx.taskNameHash() : 0,
- read ? createTtl : -1L,
- read ? accessTtl : -1L,
+ assert !implicitTx() && !implicitSingleTx() : tx;
+
+ req = new GridNearLockRequest(
+ cctx.cacheId(),
+ topVer,
+ cctx.nodeId(),
+ threadId,
+ futId,
+ lockVer,
+ inTx(),
+ read,
+ retval,
+ isolation(),
+ isInvalidate(),
+ timeout,
+ mappedKeys.size(),
+ inTx() ? tx.size() : mappedKeys.size(),
+ inTx() && tx.syncMode() == FULL_SYNC,
+ inTx() ? tx.subjectId() : null,
+ inTx() ? tx.taskNameHash() : 0,
+ read ? createTtl : -1L,
+ read ? accessTtl : -1L,
skipStore,
keepBinary,
clientFirst,
+ false,
cctx.deploymentEnabled());
mapping.request(req);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab16aa33/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
index 2ed46f5..5f042d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near;
import java.io.Externalizable;
import java.nio.ByteBuffer;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab16aa33/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 0786f29..1118d99 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
@@ -1074,6 +1074,7 @@ public final class GridNearLockFuture extends GridCacheCompoundIdentityFuture<Bo
skipStore,
keepBinary,
clientFirst,
+ true,
cctx.deploymentEnabled());
mapping.request(req);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab16aa33/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
index 4815fcf..b48693d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
@@ -55,6 +55,9 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
/** */
private static final int SYNC_COMMIT_FLAG_MASK = 0x04;
+ /** */
+ private static final int NEAR_CACHE_FLAG_MASK = 0x08;
+
/** Topology version. */
private AffinityTopologyVersion topVer;
@@ -137,8 +140,8 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
boolean skipStore,
boolean keepBinary,
boolean firstClientReq,
+ boolean nearCache,
boolean addDepInfo
-
) {
super(
cacheId,
@@ -171,6 +174,14 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
setFlag(syncCommit, SYNC_COMMIT_FLAG_MASK);
setFlag(firstClientReq, FIRST_CLIENT_REQ_FLAG_MASK);
setFlag(retVal, NEED_RETURN_VALUE_FLAG_MASK);
+ setFlag(nearCache, NEAR_CACHE_FLAG_MASK);
+ }
+
+ /**
+ * @return {@code True} if near cache enabled on originating node.
+ */
+ public boolean nearCache() {
+ return isFlag(NEAR_CACHE_FLAG_MASK);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab16aa33/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
index 9036e69..8162168 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
@@ -52,7 +52,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
/** */
private static final long serialVersionUID = 0L;
- /** Skip store flag bit mask. */
+ /** Tx onePhaseCommit flag on primary node. */
private static final int NEAR_PREPARE_ONE_PHASE_COMMIT_FLAG_MASK = 0x01;
/** Collection of versions that are pending and less than lock version. */
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab16aa33/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
index 0ee1b73..527688e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
@@ -529,10 +529,16 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
return isFlag(TX_ENTRY_KEEP_BINARY_FLAG_MASK);
}
+ /**
+ * @param addReader Add reader flag.
+ */
public void addReader(boolean addReader) {
setFlag(addReader, TX_ENTRY_ADD_READER_FLAG_MASK);
}
+ /**
+ * @return Add reader flag.
+ */
public boolean addReader() {
return isFlag(TX_ENTRY_ADD_READER_FLAG_MASK);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab16aa33/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalState.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalState.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalState.java
index 1c3677c..123d396 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalState.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalState.java
@@ -17,9 +17,6 @@
package org.apache.ignite.internal.processors.cache.transactions;
-import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
-import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
-
/**
*
*/