Merge remote-tracking branch 'remotes/origin/ignite-5578-locJoin' into ignite-5578
# Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeContext.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/34082f09 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/34082f09 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/34082f09 Branch: refs/heads/ignite-5578 Commit: 34082f09aebb50b6cc2bda2bea44065f9ff7a5e2 Parents: 39835f6 Author: sboikov <[email protected]> Authored: Thu Jul 13 13:48:14 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu Jul 13 13:48:14 2017 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/codegen/MessageCodeGenerator.java | 7 ++----- .../processors/cache/CacheAffinitySharedManager.java | 10 ---------- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 8 ++++---- .../dht/preloader/GridDhtPartitionsFullMessage.java | 2 -- 4 files changed, 6 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34082f09/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java ---------------------------------------------------------------------- diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java index f81fe7f..99ec08a 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java @@ -44,8 +44,6 @@ import org.apache.ignite.internal.GridDirectCollection; import org.apache.ignite.internal.GridDirectMap; import org.apache.ignite.internal.GridDirectTransient; import org.apache.ignite.internal.IgniteCodeGeneratingFail; -import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsFullMessage; -import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleMessage; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx; import org.apache.ignite.internal.util.typedef.internal.SB; @@ -172,15 +170,14 @@ public class MessageCodeGenerator { // gen.generateAll(true); -// gen.generateAndWrite(GridDhtPartitionsFullMessage.class); -// gen.generateAndWrite(GridDhtPartitionsSingleMessage.class); +// gen.generateAndWrite(GridChangeGlobalStateMessageResponse.class); // gen.generateAndWrite(GridNearAtomicUpdateRequest.class); // gen.generateAndWrite(GridMessageCollection.class); // gen.generateAndWrite(DataStreamerEntry.class); -// gen.generateAndWrite(GridDhtPartitionsFullMessage.class); +// gen.generateAndWrite(GridDistributedLockRequest.class); // gen.generateAndWrite(GridDistributedLockResponse.class); // gen.generateAndWrite(GridNearLockRequest.class); // gen.generateAndWrite(GridNearLockResponse.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/34082f09/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 7659e73..a31ab1c 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 @@ -1231,14 +1231,6 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap (affNodes.isEmpty() || (affNodes.size() == 1 && affNodes.contains(cctx.localNode()))); } - public List<List<ClusterNode>> affinity(AffinityTopologyVersion topVer, Integer grpId) { - CacheGroupHolder grpHolder = grpHolders.get(grpId); - - assert grpHolder != null : grpId; - - return grpHolder.affinity().assignments(topVer); - } - /** * @param crd Coordinator flag. * @throws IgniteCheckedException If failed. @@ -1330,8 +1322,6 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap } } - - /** * @param grpIds Cache group IDs. * @return Cache names. http://git-wip-us.apache.org/repos/asf/ignite/blob/34082f09/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index 9385739..3ffc8a0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -224,6 +224,10 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte private final AtomicBoolean done = new AtomicBoolean(); /** */ + @GridToStringExclude + private ExchangeContext exchCtx; + + /** */ private FinishState finishState; /** @@ -414,10 +418,6 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte return false; } - /** */ - @GridToStringExclude - private ExchangeContext exchCtx; - /** * */ http://git-wip-us.apache.org/repos/asf/ignite/blob/34082f09/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java index 6a4d895..4c79c3b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java @@ -27,14 +27,12 @@ import java.util.Set; import java.util.UUID; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.GridDirectCollection; -import org.apache.ignite.cache.affinity.Affinity; import org.apache.ignite.internal.GridDirectMap; import org.apache.ignite.internal.GridDirectTransient; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; -import org.apache.ignite.internal.util.GridLongList; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.T2;
