Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8583E18C74 for ; Wed, 27 May 2015 14:49:12 +0000 (UTC) Received: (qmail 29451 invoked by uid 500); 27 May 2015 14:49:12 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 29418 invoked by uid 500); 27 May 2015 14:49:12 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 29409 invoked by uid 99); 27 May 2015 14:49:12 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 May 2015 14:49:12 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id E2BE3C0F5C for ; Wed, 27 May 2015 14:49:11 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.229 X-Spam-Level: X-Spam-Status: No, score=-4.229 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id 5OUZbZzqmxAv for ; Wed, 27 May 2015 14:49:03 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 9AD74253C7 for ; Wed, 27 May 2015 14:48:53 +0000 (UTC) Received: (qmail 28251 invoked by uid 99); 27 May 2015 14:48:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 May 2015 14:48:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 72256DFDF1; Wed, 27 May 2015 14:48:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 27 May 2015 14:49:12 -0000 Message-Id: <67504e0b166a43918c70bb73cf893775@git.apache.org> In-Reply-To: <3ac38a18bf544ad4a15c002373f69d3e@git.apache.org> References: <3ac38a18bf544ad4a15c002373f69d3e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [21/38] incubator-ignite git commit: # ignite-23 preload pools on client # ignite-23 preload pools on client Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/de60f7f9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/de60f7f9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/de60f7f9 Branch: refs/heads/ignite-709_2 Commit: de60f7f9e343ba523c317363ed3d0c50e519bbd2 Parents: b29449e Author: sboikov Authored: Fri May 22 19:37:28 2015 +0300 Committer: sboikov Committed: Fri May 22 19:42:02 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheContext.java | 6 +++--- .../processors/cache/GridCacheGateway.java | 2 +- .../cache/GridCachePartitionExchangeManager.java | 1 - .../processors/cache/GridCachePreloader.java | 2 +- .../cache/GridCachePreloaderAdapter.java | 6 +++--- .../processors/cache/GridCacheProcessor.java | 3 +-- .../distributed/dht/GridDhtCacheAdapter.java | 8 ++++---- .../dht/GridDhtTransactionalCacheAdapter.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../dht/preloader/GridDhtForceKeysFuture.java | 4 ++-- .../dht/preloader/GridDhtPartitionDemandPool.java | 6 ++++-- .../dht/preloader/GridDhtPartitionSupplyPool.java | 18 ++++++++++-------- .../dht/preloader/GridDhtPreloader.java | 18 +++++++++--------- .../distributed/near/GridNearCacheAdapter.java | 2 +- .../processors/cache/local/GridLocalCache.java | 6 +++--- .../cache/local/atomic/GridLocalAtomicCache.java | 6 +++--- 17 files changed, 48 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de60f7f9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index d390037..bbd13f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -348,7 +348,7 @@ public abstract class GridCacheAdapter implements IgniteInternalCache preloader(); + public abstract GridCachePreloader preloader(); /** {@inheritDoc} */ @Override public Affinity affinity() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de60f7f9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index 2eeaed6..b20e59d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -348,7 +348,7 @@ public class GridCacheContext implements Externalizable { public void awaitStarted() throws IgniteCheckedException { U.await(startLatch); - GridCachePreloader prldr = preloader(); + GridCachePreloader prldr = preloader(); if (prldr != null) prldr.startFuture().get(); @@ -361,7 +361,7 @@ public class GridCacheContext implements Externalizable { if (startLatch.getCount() != 0) return false; - GridCachePreloader prldr = preloader(); + GridCachePreloader prldr = preloader(); return prldr == null || prldr.startFuture().isDone(); } @@ -682,7 +682,7 @@ public class GridCacheContext implements Externalizable { /** * @return Preloader. */ - public GridCachePreloader preloader() { + public GridCachePreloader preloader() { return cache().preloader(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de60f7f9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java index 9d680ef..d9d151c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java @@ -127,7 +127,7 @@ public class GridCacheGateway { try { GridCacheAdapter cache = ctx.cache(); - GridCachePreloader preldr = cache != null ? cache.preloader() : null; + GridCachePreloader preldr = cache != null ? cache.preloader() : null; if (preldr == null) throw new IllegalStateException("Grid is in invalid state to perform this operation. " + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de60f7f9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index 30ec46a..488227b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@ -97,7 +97,6 @@ public class GridCachePartitionExchangeManager extends GridCacheSharedMana private final AtomicReference readyTopVer = new AtomicReference<>(AffinityTopologyVersion.NONE); - /** * Partition map futures. * This set also contains already completed exchange futures to address race conditions when coordinator http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de60f7f9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java index 5a73843..e0f6181 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java @@ -30,7 +30,7 @@ import java.util.*; * Cache preloader that is responsible for loading cache entries either from remote * nodes (for distributed cache) or anywhere else at cache startup. */ -public interface GridCachePreloader { +public interface GridCachePreloader { /** * Starts preloading. * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de60f7f9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java index 8cd5264..78faae8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java @@ -31,9 +31,9 @@ import java.util.*; /** * Adapter for preloading which always assumes that preloading finished. */ -public class GridCachePreloaderAdapter implements GridCachePreloader { +public class GridCachePreloaderAdapter implements GridCachePreloader { /** Cache context. */ - protected final GridCacheContext cctx; + protected final GridCacheContext cctx; /** Logger.*/ protected final IgniteLogger log; @@ -50,7 +50,7 @@ public class GridCachePreloaderAdapter implements GridCachePreloader /** * @param cctx Cache context. */ - public GridCachePreloaderAdapter(GridCacheContext cctx) { + public GridCachePreloaderAdapter(GridCacheContext cctx) { assert cctx != null; this.cctx = cctx; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de60f7f9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index f94f9d7..d9a7755 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -766,8 +766,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { int order = cfg.getRebalanceOrder(); if (order > 0 && order != maxRebalanceOrder && cfg.getCacheMode() != LOCAL) { - GridCompoundFuture fut = (GridCompoundFuture)preloadFuts - .get(order); + GridCompoundFuture fut = (GridCompoundFuture)preloadFuts.get(order); if (fut == null) { fut = new GridCompoundFuture<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de60f7f9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java index dc29c8a..3693422 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java @@ -54,7 +54,7 @@ public abstract class GridDhtCacheAdapter extends GridDistributedCacheAdap private GridDhtPartitionTopology top; /** Preloader. */ - protected GridCachePreloader preldr; + protected GridCachePreloader preldr; /** Multi tx future holder. */ private ThreadLocal> multiTxHolder = new ThreadLocal<>(); @@ -168,17 +168,17 @@ public abstract class GridDhtCacheAdapter extends GridDistributedCacheAdap } /** {@inheritDoc} */ - @Override public GridCachePreloader preloader() { + @Override public GridCachePreloader preloader() { return preldr; } /** * @return DHT preloader. */ - public GridDhtPreloader dhtPreloader() { + public GridDhtPreloader dhtPreloader() { assert preldr instanceof GridDhtPreloader; - return (GridDhtPreloader)preldr; + return (GridDhtPreloader)preldr; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de60f7f9/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 fd58ef4..3c6ab7b 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 @@ -81,7 +81,7 @@ public abstract class GridDhtTransactionalCacheAdapter extends GridDhtCach @Override public void start() throws IgniteCheckedException { super.start(); - preldr = new GridDhtPreloader<>(ctx); + preldr = new GridDhtPreloader(ctx); preldr.start(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de60f7f9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index 301943a..7fe847a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -171,7 +171,7 @@ public class GridDhtAtomicCache extends GridDhtCacheAdapter { metrics = m; - preldr = new GridDhtPreloader<>(ctx); + preldr = new GridDhtPreloader(ctx); preldr.start(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de60f7f9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java index 78966d0..9637fd1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java @@ -80,7 +80,7 @@ public final class GridDhtForceKeysFuture extends GridCompoundFuture preloader; + private GridDhtPreloader preloader; /** Trackable flag. */ private boolean trackable; @@ -95,7 +95,7 @@ public final class GridDhtForceKeysFuture extends GridCompoundFuture cctx, AffinityTopologyVersion topVer, Collection keys, - GridDhtPreloader preloader + GridDhtPreloader preloader ) { assert topVer.topologyVersion() != 0 : topVer; assert !F.isEmpty(keys) : keys; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de60f7f9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java index 1071468..a6e6c4d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java @@ -108,9 +108,11 @@ public class GridDhtPartitionDemandPool { log = cctx.logger(getClass()); - poolSize = cctx.rebalanceEnabled() ? cctx.config().getRebalanceThreadPoolSize() : 0; + boolean enabled = cctx.rebalanceEnabled() && !cctx.kernalContext().clientNode(); - if (poolSize > 0) { + poolSize = enabled ? cctx.config().getRebalanceThreadPoolSize() : 0; + + if (enabled) { barrier = new CyclicBarrier(poolSize); dmdWorkers = new ArrayList<>(poolSize); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de60f7f9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java index 84ac7c5..311d96d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java @@ -83,16 +83,18 @@ class GridDhtPartitionSupplyPool { top = cctx.dht().topology(); - int poolSize = cctx.rebalanceEnabled() ? cctx.config().getRebalanceThreadPoolSize() : 0; + if (!cctx.kernalContext().clientNode()) { + int poolSize = cctx.rebalanceEnabled() ? cctx.config().getRebalanceThreadPoolSize() : 0; - for (int i = 0; i < poolSize; i++) - workers.add(new SupplyWorker()); + for (int i = 0; i < poolSize; i++) + workers.add(new SupplyWorker()); - cctx.io().addHandler(cctx.cacheId(), GridDhtPartitionDemandMessage.class, new CI2() { - @Override public void apply(UUID id, GridDhtPartitionDemandMessage m) { - processDemandMessage(id, m); - } - }); + cctx.io().addHandler(cctx.cacheId(), GridDhtPartitionDemandMessage.class, new CI2() { + @Override public void apply(UUID id, GridDhtPartitionDemandMessage m) { + processDemandMessage(id, m); + } + }); + } depEnabled = cctx.gridDeploy().enabled(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de60f7f9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java index 61ba8b2..dc81993 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java @@ -46,7 +46,7 @@ import static org.apache.ignite.internal.util.GridConcurrentFactory.*; /** * DHT cache preloader. */ -public class GridDhtPreloader extends GridCachePreloaderAdapter { +public class GridDhtPreloader extends GridCachePreloaderAdapter { /** Default preload resend timeout. */ public static final long DFLT_PRELOAD_RESEND_TIMEOUT = 1500; @@ -57,7 +57,7 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { private final GridAtomicLong topVer = new GridAtomicLong(); /** Force key futures. */ - private final ConcurrentMap> forceKeyFuts = newMap(); + private final ConcurrentMap> forceKeyFuts = newMap(); /** Partition suppliers. */ private GridDhtPartitionSupplyPool supplyPool; @@ -92,7 +92,7 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { assert !loc.id().equals(n.id()); - for (GridDhtForceKeysFuture f : forceKeyFuts.values()) + for (GridDhtForceKeysFuture f : forceKeyFuts.values()) f.onDiscoveryEvent(e); assert e.type() != EVT_NODE_JOINED || n.order() > loc.order() : "Node joined with smaller-than-local " + @@ -117,7 +117,7 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { /** * @param cctx Cache context. */ - public GridDhtPreloader(GridCacheContext cctx) { + public GridDhtPreloader(GridCacheContext cctx) { super(cctx); top = cctx.dht().topology(); @@ -271,7 +271,7 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { /** {@inheritDoc} */ @Override public IgniteInternalFuture syncFuture() { - return cctx.kernalContext().clientNode() ? new GridFinishedFuture<>() : demandPool.syncFuture(); + return demandPool.syncFuture(); } /** @@ -406,7 +406,7 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { return; try { - GridDhtForceKeysFuture f = forceKeyFuts.get(msg.futureId()); + GridDhtForceKeysFuture f = forceKeyFuts.get(msg.futureId()); if (f != null) f.onResult(node.id(), msg); @@ -491,7 +491,7 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { */ @SuppressWarnings( {"unchecked", "RedundantCast"}) @Override public GridDhtFuture request(Collection keys, AffinityTopologyVersion topVer) { - final GridDhtForceKeysFuture fut = new GridDhtForceKeysFuture<>(cctx, topVer, keys, this); + final GridDhtForceKeysFuture fut = new GridDhtForceKeysFuture<>(cctx, topVer, keys, this); IgniteInternalFuture topReadyFut = cctx.affinity().affinityReadyFuturex(topVer); @@ -543,7 +543,7 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { * * @param fut Future to add. */ - void addFuture(GridDhtForceKeysFuture fut) { + void addFuture(GridDhtForceKeysFuture fut) { forceKeyFuts.put(fut.futureId(), fut); } @@ -552,7 +552,7 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { * * @param fut Future to remove. */ - void remoteFuture(GridDhtForceKeysFuture fut) { + void remoteFuture(GridDhtForceKeysFuture fut) { forceKeyFuts.remove(fut.futureId(), fut); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de60f7f9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java index 8258b14..351d6cd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java @@ -95,7 +95,7 @@ public abstract class GridNearCacheAdapter extends GridDistributedCacheAda } /** {@inheritDoc} */ - @Override public GridCachePreloader preloader() { + @Override public GridCachePreloader preloader() { return dht().preloader(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de60f7f9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java index 6120e25..4adcff5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java @@ -41,7 +41,7 @@ public class GridLocalCache extends GridCacheAdapter { private static final long serialVersionUID = 0L; /** */ - private GridCachePreloader preldr; + private GridCachePreloader preldr; /** * Empty constructor required by {@link Externalizable}. @@ -56,7 +56,7 @@ public class GridLocalCache extends GridCacheAdapter { public GridLocalCache(GridCacheContext ctx) { super(ctx, ctx.config().getStartSize()); - preldr = new GridCachePreloaderAdapter<>(ctx); + preldr = new GridCachePreloaderAdapter(ctx); } /** {@inheritDoc} */ @@ -65,7 +65,7 @@ public class GridLocalCache extends GridCacheAdapter { } /** {@inheritDoc} */ - @Override public GridCachePreloader preloader() { + @Override public GridCachePreloader preloader() { return preldr; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de60f7f9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java index 819b0f0..c0dc360 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java @@ -53,7 +53,7 @@ public class GridLocalAtomicCache extends GridCacheAdapter { private static final sun.misc.Unsafe UNSAFE = GridUnsafe.unsafe(); /** */ - private GridCachePreloader preldr; + private GridCachePreloader preldr; /** * Empty constructor required by {@link Externalizable}. @@ -68,7 +68,7 @@ public class GridLocalAtomicCache extends GridCacheAdapter { public GridLocalAtomicCache(GridCacheContext ctx) { super(ctx, ctx.config().getStartSize()); - preldr = new GridCachePreloaderAdapter<>(ctx); + preldr = new GridCachePreloaderAdapter(ctx); } /** {@inheritDoc} */ @@ -94,7 +94,7 @@ public class GridLocalAtomicCache extends GridCacheAdapter { } /** {@inheritDoc} */ - @Override public GridCachePreloader preloader() { + @Override public GridCachePreloader preloader() { return preldr; }