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/13 07:47:09 UTC
[39/39] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-5272
Merge remote-tracking branch 'remotes/origin/master' into ignite-5272
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/721d5684
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/721d5684
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/721d5684
Branch: refs/heads/ignite-5272
Commit: 721d5684faa13b2fca1b493e8f1e07e60af828fc
Parents: 75ef7f3
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jun 13 10:46:14 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jun 13 10:46:14 2017 +0300
----------------------------------------------------------------------
.../processors/cache/CacheAffinitySharedManager.java | 13 +++----------
.../cache/ClientCacheChangeDummyDiscoveryMessage.java | 3 ++-
.../distributed/dht/GridDhtPartitionTopology.java | 2 +-
.../cache/distributed/dht/GridDhtTxLocalAdapter.java | 2 +-
.../GridNearAtomicAbstractSingleUpdateRequest.java | 2 --
.../atomic/GridNearAtomicAbstractUpdateRequest.java | 10 ----------
.../dht/atomic/GridNearAtomicFullUpdateRequest.java | 2 --
.../GridNearAtomicSingleUpdateFilterRequest.java | 2 --
.../dht/atomic/GridNearAtomicSingleUpdateFuture.java | 4 ----
.../GridNearAtomicSingleUpdateInvokeRequest.java | 2 --
.../dht/atomic/GridNearAtomicSingleUpdateRequest.java | 2 --
.../dht/atomic/GridNearAtomicUpdateFuture.java | 2 --
12 files changed, 7 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/721d5684/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
index 64ca70c..e74437c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
@@ -324,13 +324,6 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
}
/**
- * @param exchActions Cache change requests to execute on exchange.
- */
- private void updateCachesInfo(ExchangeActions exchActions) {
- caches.updateCachesInfo(exchActions);
- }
-
- /**
* @param reqId Request ID.
* @param startReqs Client cache start request.
* @return Descriptors for caches to start.
@@ -582,7 +575,7 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
{
assert exchActions != null && !exchActions.empty() : exchActions;
- updateCachesInfo(exchActions);
+ caches.updateCachesInfo(exchActions);
// Affinity did not change for existing caches.
forAllCacheGroups(crd && lateAffAssign, new IgniteInClosureX<GridAffinityAssignmentCache>() {
@@ -2074,10 +2067,10 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
*
*/
static class CachesInfo {
- /** Registered caches (updated from exchange thread). */
+ /** Registered cache groups (updated from exchange thread). */
private final ConcurrentHashMap<Integer, CacheGroupDescriptor> registeredGrps = new ConcurrentHashMap<>();
- /** */
+ /** Registered caches (updated from exchange thread). */
private final ConcurrentHashMap<String, DynamicCacheDescriptor> registeredCaches = new ConcurrentHashMap<>();
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/721d5684/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDummyDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDummyDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDummyDiscoveryMessage.java
index d4e6d2d..c33ee67 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDummyDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDummyDiscoveryMessage.java
@@ -28,7 +28,8 @@ import org.jetbrains.annotations.Nullable;
/**
* Dummy discovery message which is not really sent via ring, it is just added in local discovery worker queue.
*/
-public class ClientCacheChangeDummyDiscoveryMessage implements DiscoveryCustomMessage, CachePartitionExchangeWorkerTask {
+public class ClientCacheChangeDummyDiscoveryMessage implements DiscoveryCustomMessage,
+ CachePartitionExchangeWorkerTask {
/** */
private final UUID reqId;
http://git-wip-us.apache.org/repos/asf/ignite/blob/721d5684/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java
index 92a2981..acb822c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopology.java
@@ -252,7 +252,7 @@ public interface GridDhtPartitionTopology {
* This method should be called on topology coordinator after all partition messages are received.
*
* @param discoEvt Discovery event for which we detect lost partitions.
- * @return {@code True} if partitons state got updated.
+ * @return {@code True} if partitions state got updated.
*/
public boolean detectLostPartitions(DiscoveryEvent discoEvt);
http://git-wip-us.apache.org/repos/asf/ignite/blob/721d5684/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 1dc1681..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
@@ -616,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/721d5684/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java
index 899bc2a..7022561 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java
@@ -60,7 +60,6 @@ public abstract class GridNearAtomicAbstractSingleUpdateRequest extends GridNear
*/
protected GridNearAtomicAbstractSingleUpdateRequest(
int cacheId,
- boolean nearCache,
UUID nodeId,
long futId,
@NotNull AffinityTopologyVersion topVer,
@@ -72,7 +71,6 @@ public abstract class GridNearAtomicAbstractSingleUpdateRequest extends GridNear
boolean addDepInfo
) {
super(cacheId,
- nearCache,
nodeId,
futId,
topVer,
http://git-wip-us.apache.org/repos/asf/ignite/blob/721d5684/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java
index e910386..62618f8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java
@@ -125,7 +125,6 @@ public abstract class GridNearAtomicAbstractUpdateRequest extends GridCacheIdMes
*/
protected GridNearAtomicAbstractUpdateRequest(
int cacheId,
- boolean nearCache,
UUID nodeId,
long futId,
@NotNull AffinityTopologyVersion topVer,
@@ -211,15 +210,6 @@ public abstract class GridNearAtomicAbstractUpdateRequest extends GridCacheIdMes
*/
public boolean nearCache() {
return isFlag(NEAR_CACHE_FLAG_MASK);
- if (nearCache)
- setFlag(true, NEAR_CACHE_FLAG_MASK);
- }
-
- /**
- * @return {@code True} if near cache is enabled on node initiated operation.
- */
- public boolean nearCache() {
- return isFlag(NEAR_CACHE_FLAG_MASK);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/721d5684/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
index 3b260a1..4b9aef0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
@@ -135,7 +135,6 @@ public class GridNearAtomicFullUpdateRequest extends GridNearAtomicAbstractUpdat
*/
GridNearAtomicFullUpdateRequest(
int cacheId,
- boolean nearCache,
UUID nodeId,
long futId,
@NotNull AffinityTopologyVersion topVer,
@@ -151,7 +150,6 @@ public class GridNearAtomicFullUpdateRequest extends GridNearAtomicAbstractUpdat
int maxEntryCnt
) {
super(cacheId,
- nearCache,
nodeId,
futId,
topVer,
http://git-wip-us.apache.org/repos/asf/ignite/blob/721d5684/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
index 9bfa223..5c66bc4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
@@ -70,7 +70,6 @@ public class GridNearAtomicSingleUpdateFilterRequest extends GridNearAtomicSingl
*/
GridNearAtomicSingleUpdateFilterRequest(
int cacheId,
- boolean nearCache,
UUID nodeId,
long futId,
@NotNull AffinityTopologyVersion topVer,
@@ -84,7 +83,6 @@ public class GridNearAtomicSingleUpdateFilterRequest extends GridNearAtomicSingl
) {
super(
cacheId,
- nearCache,
nodeId,
futId,
topVer,
http://git-wip-us.apache.org/repos/asf/ignite/blob/721d5684/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
index 9e4f5a9..60d94b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
@@ -574,7 +574,6 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
if (op == TRANSFORM) {
req = new GridNearAtomicSingleUpdateInvokeRequest(
cctx.cacheId(),
- nearEnabled,
primary.id(),
futId,
topVer,
@@ -590,7 +589,6 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
if (filter == null || filter.length == 0) {
req = new GridNearAtomicSingleUpdateRequest(
cctx.cacheId(),
- nearEnabled,
primary.id(),
futId,
topVer,
@@ -604,7 +602,6 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
else {
req = new GridNearAtomicSingleUpdateFilterRequest(
cctx.cacheId(),
- nearEnabled,
primary.id(),
futId,
topVer,
@@ -621,7 +618,6 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
else {
req = new GridNearAtomicFullUpdateRequest(
cctx.cacheId(),
- nearEnabled,
primary.id(),
futId,
topVer,
http://git-wip-us.apache.org/repos/asf/ignite/blob/721d5684/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
index 297de61..b1fb530 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
@@ -88,7 +88,6 @@ public class GridNearAtomicSingleUpdateInvokeRequest extends GridNearAtomicSingl
*/
GridNearAtomicSingleUpdateInvokeRequest(
int cacheId,
- boolean nearCache,
UUID nodeId,
long futId,
@NotNull AffinityTopologyVersion topVer,
@@ -102,7 +101,6 @@ public class GridNearAtomicSingleUpdateInvokeRequest extends GridNearAtomicSingl
) {
super(
cacheId,
- nearCache,
nodeId,
futId,
topVer,
http://git-wip-us.apache.org/repos/asf/ignite/blob/721d5684/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
index 8357e74..dd3a7be 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
@@ -80,7 +80,6 @@ public class GridNearAtomicSingleUpdateRequest extends GridNearAtomicAbstractSin
*/
GridNearAtomicSingleUpdateRequest(
int cacheId,
- boolean nearCache,
UUID nodeId,
long futId,
@NotNull AffinityTopologyVersion topVer,
@@ -92,7 +91,6 @@ public class GridNearAtomicSingleUpdateRequest extends GridNearAtomicAbstractSin
boolean addDepInfo
) {
super(cacheId,
- nearCache,
nodeId,
futId,
topVer,
http://git-wip-us.apache.org/repos/asf/ignite/blob/721d5684/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index dc39888..190ed3f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -1015,7 +1015,6 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
GridNearAtomicFullUpdateRequest req = new GridNearAtomicFullUpdateRequest(
cctx.cacheId(),
- nearEnabled,
nodeId,
futId,
topVer,
@@ -1126,7 +1125,6 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
GridNearAtomicFullUpdateRequest req = new GridNearAtomicFullUpdateRequest(
cctx.cacheId(),
- nearEnabled,
primary.id(),
futId,
topVer,