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 2015/05/29 14:46:11 UTC
[04/50] 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-929
Commit: de60f7f9e343ba523c317363ed3d0c50e519bbd2
Parents: b29449e
Author: sboikov <sb...@gridgain.com>
Authored: Fri May 22 19:37:28 2015 +0300
Committer: sboikov <sb...@gridgain.com>
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<K, V> implements IgniteInternalCache<K, V
/**
* @return Preloader.
*/
- public abstract GridCachePreloader<K, V> preloader();
+ public abstract GridCachePreloader preloader();
/** {@inheritDoc} */
@Override public Affinity<K> 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<K, V> implements Externalizable {
public void awaitStarted() throws IgniteCheckedException {
U.await(startLatch);
- GridCachePreloader<K, V> prldr = preloader();
+ GridCachePreloader prldr = preloader();
if (prldr != null)
prldr.startFuture().get();
@@ -361,7 +361,7 @@ public class GridCacheContext<K, V> implements Externalizable {
if (startLatch.getCount() != 0)
return false;
- GridCachePreloader<K, V> prldr = preloader();
+ GridCachePreloader prldr = preloader();
return prldr == null || prldr.startFuture().isDone();
}
@@ -682,7 +682,7 @@ public class GridCacheContext<K, V> implements Externalizable {
/**
* @return Preloader.
*/
- public GridCachePreloader<K, V> 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<K, V> {
try {
GridCacheAdapter<K, V> cache = ctx.cache();
- GridCachePreloader<K, V> 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<K, V> extends GridCacheSharedMana
private final AtomicReference<AffinityTopologyVersion> 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<K, V> {
+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<K, V> implements GridCachePreloader<K, V> {
+public class GridCachePreloaderAdapter implements GridCachePreloader {
/** Cache context. */
- protected final GridCacheContext<K, V> cctx;
+ protected final GridCacheContext<?, ?> cctx;
/** Logger.*/
protected final IgniteLogger log;
@@ -50,7 +50,7 @@ public class GridCachePreloaderAdapter<K, V> implements GridCachePreloader<K, V>
/**
* @param cctx Cache context.
*/
- public GridCachePreloaderAdapter(GridCacheContext<K, V> 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<Object, Object> fut = (GridCompoundFuture<Object, Object>)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<K, V> extends GridDistributedCacheAdap
private GridDhtPartitionTopology top;
/** Preloader. */
- protected GridCachePreloader<K, V> preldr;
+ protected GridCachePreloader preldr;
/** Multi tx future holder. */
private ThreadLocal<IgniteBiTuple<IgniteUuid, GridDhtTopologyFuture>> multiTxHolder = new ThreadLocal<>();
@@ -168,17 +168,17 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
}
/** {@inheritDoc} */
- @Override public GridCachePreloader<K, V> preloader() {
+ @Override public GridCachePreloader preloader() {
return preldr;
}
/**
* @return DHT preloader.
*/
- public GridDhtPreloader<K, V> dhtPreloader() {
+ public GridDhtPreloader dhtPreloader() {
assert preldr instanceof GridDhtPreloader;
- return (GridDhtPreloader<K, V>)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<K, V> 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<K, V> extends GridDhtCacheAdapter<K, V> {
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<K, V> extends GridCompoundFuture<Objec
private IgniteUuid futId = IgniteUuid.randomUuid();
/** Preloader. */
- private GridDhtPreloader<K, V> preloader;
+ private GridDhtPreloader preloader;
/** Trackable flag. */
private boolean trackable;
@@ -95,7 +95,7 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
GridCacheContext<K, V> cctx,
AffinityTopologyVersion topVer,
Collection<KeyCacheObject> keys,
- GridDhtPreloader<K, V> 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<UUID, GridDhtPartitionDemandMessage>() {
- @Override public void apply(UUID id, GridDhtPartitionDemandMessage m) {
- processDemandMessage(id, m);
- }
- });
+ cctx.io().addHandler(cctx.cacheId(), GridDhtPartitionDemandMessage.class, new CI2<UUID, GridDhtPartitionDemandMessage>() {
+ @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<K, V> extends GridCachePreloaderAdapter<K, V> {
+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<K, V> extends GridCachePreloaderAdapter<K, V> {
private final GridAtomicLong topVer = new GridAtomicLong();
/** Force key futures. */
- private final ConcurrentMap<IgniteUuid, GridDhtForceKeysFuture<K, V>> forceKeyFuts = newMap();
+ private final ConcurrentMap<IgniteUuid, GridDhtForceKeysFuture<?, ?>> forceKeyFuts = newMap();
/** Partition suppliers. */
private GridDhtPartitionSupplyPool supplyPool;
@@ -92,7 +92,7 @@ public class GridDhtPreloader<K, V> extends GridCachePreloaderAdapter<K, V> {
assert !loc.id().equals(n.id());
- for (GridDhtForceKeysFuture<K, V> 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<K, V> extends GridCachePreloaderAdapter<K, V> {
/**
* @param cctx Cache context.
*/
- public GridDhtPreloader(GridCacheContext<K, V> cctx) {
+ public GridDhtPreloader(GridCacheContext<?, ?> cctx) {
super(cctx);
top = cctx.dht().topology();
@@ -271,7 +271,7 @@ public class GridDhtPreloader<K, V> extends GridCachePreloaderAdapter<K, V> {
/** {@inheritDoc} */
@Override public IgniteInternalFuture<?> syncFuture() {
- return cctx.kernalContext().clientNode() ? new GridFinishedFuture<>() : demandPool.syncFuture();
+ return demandPool.syncFuture();
}
/**
@@ -406,7 +406,7 @@ public class GridDhtPreloader<K, V> extends GridCachePreloaderAdapter<K, V> {
return;
try {
- GridDhtForceKeysFuture<K, V> 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<K, V> extends GridCachePreloaderAdapter<K, V> {
*/
@SuppressWarnings( {"unchecked", "RedundantCast"})
@Override public GridDhtFuture<Object> request(Collection<KeyCacheObject> keys, AffinityTopologyVersion topVer) {
- final GridDhtForceKeysFuture<K, V> 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<K, V> extends GridCachePreloaderAdapter<K, V> {
*
* @param fut Future to add.
*/
- void addFuture(GridDhtForceKeysFuture<K, V> fut) {
+ void addFuture(GridDhtForceKeysFuture<?, ?> fut) {
forceKeyFuts.put(fut.futureId(), fut);
}
@@ -552,7 +552,7 @@ public class GridDhtPreloader<K, V> extends GridCachePreloaderAdapter<K, V> {
*
* @param fut Future to remove.
*/
- void remoteFuture(GridDhtForceKeysFuture<K, V> 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<K, V> extends GridDistributedCacheAda
}
/** {@inheritDoc} */
- @Override public GridCachePreloader<K, V> 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<K, V> extends GridCacheAdapter<K, V> {
private static final long serialVersionUID = 0L;
/** */
- private GridCachePreloader<K,V> preldr;
+ private GridCachePreloader preldr;
/**
* Empty constructor required by {@link Externalizable}.
@@ -56,7 +56,7 @@ public class GridLocalCache<K, V> extends GridCacheAdapter<K, V> {
public GridLocalCache(GridCacheContext<K, V> ctx) {
super(ctx, ctx.config().getStartSize());
- preldr = new GridCachePreloaderAdapter<>(ctx);
+ preldr = new GridCachePreloaderAdapter(ctx);
}
/** {@inheritDoc} */
@@ -65,7 +65,7 @@ public class GridLocalCache<K, V> extends GridCacheAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public GridCachePreloader<K, V> 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<K, V> extends GridCacheAdapter<K, V> {
private static final sun.misc.Unsafe UNSAFE = GridUnsafe.unsafe();
/** */
- private GridCachePreloader<K,V> preldr;
+ private GridCachePreloader preldr;
/**
* Empty constructor required by {@link Externalizable}.
@@ -68,7 +68,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
public GridLocalAtomicCache(GridCacheContext<K, V> ctx) {
super(ctx, ctx.config().getStartSize());
- preldr = new GridCachePreloaderAdapter<>(ctx);
+ preldr = new GridCachePreloaderAdapter(ctx);
}
/** {@inheritDoc} */
@@ -94,7 +94,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public GridCachePreloader<K, V> preloader() {
+ @Override public GridCachePreloader preloader() {
return preldr;
}