You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/02/02 11:29:08 UTC
[32/50] [abbrv] incubator-ignite git commit: # sprint-1 moved
existing IgniteFuture to internal package
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index c2c330e..a4d0fa6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -947,7 +947,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
* @param awaitVer Topology version to await.
* @return Future.
*/
- public IgniteFuture<Long> topologyFuture(final long awaitVer) {
+ public IgniteInternalFuture<Long> topologyFuture(final long awaitVer) {
long topVer = topologyVersion();
if (topVer >= awaitVer)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
index 6e4670a..ea2d85e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
@@ -661,7 +661,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
* @param types Event types to wait for.
* @return Event future.
*/
- public <T extends IgniteEvent> IgniteFuture<T> waitForEvent(@Nullable final IgnitePredicate<T> p,
+ public <T extends IgniteEvent> IgniteInternalFuture<T> waitForEvent(@Nullable final IgnitePredicate<T> p,
@Nullable int... types) {
final GridFutureAdapter<T> fut = new GridFutureAdapter<>(ctx);
@@ -760,7 +760,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
* @param timeout Maximum time to wait for result, if {@code 0}, then wait until result is received.
* @return Collection of events.
*/
- public <T extends IgniteEvent> IgniteFuture<List<T>> remoteEventsAsync(final IgnitePredicate<T> p,
+ public <T extends IgniteEvent> IgniteInternalFuture<List<T>> remoteEventsAsync(final IgnitePredicate<T> p,
final Collection<? extends ClusterNode> nodes, final long timeout) {
assert p != null;
assert nodes != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
index 3436a9f..c98ab73 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
@@ -23,7 +23,6 @@ import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.lang.*;
import org.apache.ignite.portables.*;
import org.apache.ignite.internal.util.future.*;
import org.apache.ignite.internal.util.typedef.*;
@@ -212,7 +211,7 @@ public class GridAffinityAssignmentCache {
* @param topVer Topology version to await for.
* @return Future that will be completed after affinity for topology version {@code topVer} is calculated.
*/
- public IgniteFuture<Long> readyFuture(long topVer) {
+ public IgniteInternalFuture<Long> readyFuture(long topVer) {
GridAffinityAssignment aff = head.get();
if (aff.topologyVersion() >= topVer) {
@@ -346,7 +345,7 @@ public class GridAffinityAssignmentCache {
log.debug("Will wait for topology version [locNodeId=" + ctx.localNodeId() +
", topVer=" + topVer + ']');
- IgniteFuture<Long> fut = readyFuture(topVer);
+ IgniteInternalFuture<Long> fut = readyFuture(topVer);
if (fut != null)
fut.get();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
index ecc94df..10888a6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
@@ -61,7 +61,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
private static final String NULL_NAME = U.id8(UUID.randomUUID());
/** Affinity map. */
- private final ConcurrentMap<AffinityAssignmentKey, IgniteFuture<AffinityInfo>> affMap = new ConcurrentHashMap8<>();
+ private final ConcurrentMap<AffinityAssignmentKey, IgniteInternalFuture<AffinityInfo>> affMap = new ConcurrentHashMap8<>();
/** Listener. */
private final GridLocalEventListener lsnr = new GridLocalEventListener() {
@@ -266,7 +266,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
private AffinityInfo affinityCache(@Nullable final String cacheName, long topVer) throws IgniteCheckedException {
AffinityAssignmentKey key = new AffinityAssignmentKey(cacheName, topVer);
- IgniteFuture<AffinityInfo> fut = affMap.get(key);
+ IgniteInternalFuture<AffinityInfo> fut = affMap.get(key);
if (fut != null)
return fut.get();
@@ -283,7 +283,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
new GridAffinityAssignment(topVer, cctx.affinity().assignments(topVer)),
cctx.portableEnabled());
- IgniteFuture<AffinityInfo> old = affMap.putIfAbsent(key, new GridFinishedFuture<>(ctx, info));
+ IgniteInternalFuture<AffinityInfo> old = affMap.putIfAbsent(key, new GridFinishedFuture<>(ctx, info));
if (old != null)
info = old.get();
@@ -304,7 +304,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
GridFutureAdapter<AffinityInfo> fut0 = new GridFutureAdapter<>();
- IgniteFuture<AffinityInfo> old = affMap.putIfAbsent(key, fut0);
+ IgniteInternalFuture<AffinityInfo> old = affMap.putIfAbsent(key, fut0);
if (old != null)
return old.get();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java
index d918499..8788eac 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java
@@ -18,8 +18,8 @@
package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
import org.jetbrains.annotations.*;
import javax.cache.*;
@@ -127,7 +127,7 @@ class CacheLockImpl<K, V> implements Lock {
GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
try {
- IgniteFuture<Boolean> fut = delegate.lockAllAsync(keys, unit.toMillis(time));
+ IgniteInternalFuture<Boolean> fut = delegate.lockAllAsync(keys, unit.toMillis(time));
try {
boolean res = fut.get();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/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 4f401c0..92d2039 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
@@ -92,8 +92,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
/** {@link GridCacheReturn}-to-value conversion. */
private static final IgniteClosure RET2VAL =
- new CX1<IgniteFuture<GridCacheReturn<Object>>, Object>() {
- @Nullable @Override public Object applyx(IgniteFuture<GridCacheReturn<Object>> fut) throws IgniteCheckedException {
+ new CX1<IgniteInternalFuture<GridCacheReturn<Object>>, Object>() {
+ @Nullable @Override public Object applyx(IgniteInternalFuture<GridCacheReturn<Object>> fut) throws IgniteCheckedException {
return fut.get().value();
}
@@ -104,8 +104,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
/** {@link GridCacheReturn}-to-success conversion. */
private static final IgniteClosure RET2FLAG =
- new CX1<IgniteFuture<GridCacheReturn<Object>>, Boolean>() {
- @Override public Boolean applyx(IgniteFuture<GridCacheReturn<Object>> fut) throws IgniteCheckedException {
+ new CX1<IgniteInternalFuture<GridCacheReturn<Object>>, Boolean>() {
+ @Override public Boolean applyx(IgniteInternalFuture<GridCacheReturn<Object>> fut) throws IgniteCheckedException {
return fut.get().success();
}
@@ -562,7 +562,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
* @param filter Optional filter.
* @return Locks future.
*/
- public abstract IgniteFuture<Boolean> txLockAsync(
+ public abstract IgniteInternalFuture<Boolean> txLockAsync(
Collection<? extends K> keys,
long timeout,
IgniteTxLocalEx<K, V> tx,
@@ -645,7 +645,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> containsKeyAsync(K key) {
+ @Override public IgniteInternalFuture<Boolean> containsKeyAsync(K key) {
return containsKeyAsync(key, null);
}
@@ -654,7 +654,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
* @param filter Filter.
* @return Future.
*/
- public IgniteFuture<Boolean> containsKeyAsync(K key, @Nullable IgnitePredicate<CacheEntry<K, V>> filter) {
+ public IgniteInternalFuture<Boolean> containsKeyAsync(K key, @Nullable IgnitePredicate<CacheEntry<K, V>> filter) {
return new GridFinishedFuture<>(ctx.kernalContext(), containsKey(key, filter));
}
@@ -1295,7 +1295,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
// Send job to remote nodes only.
Collection<ClusterNode> nodes = ctx.grid().forCache(name()).forRemotes().nodes();
- IgniteFuture<Object> fut = null;
+ IgniteInternalFuture<Object> fut = null;
if (!nodes.isEmpty()) {
ctx.kernalContext().task().setThreadContext(TC_TIMEOUT, timeout);
@@ -1392,14 +1392,14 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<V> getForcePrimaryAsync(final K key) {
+ @Override public IgniteInternalFuture<V> getForcePrimaryAsync(final K key) {
ctx.denyOnFlag(LOCAL);
String taskName = ctx.kernalContext().job().currentTaskName();
return getAllAsync(Collections.singletonList(key), /*force primary*/true, /*skip tx*/false, null, null,
- taskName, true).chain(new CX1<IgniteFuture<Map<K, V>>, V>() {
- @Override public V applyx(IgniteFuture<Map<K, V>> e) throws IgniteCheckedException {
+ taskName, true).chain(new CX1<IgniteInternalFuture<Map<K, V>>, V>() {
+ @Override public V applyx(IgniteInternalFuture<Map<K, V>> e) throws IgniteCheckedException {
return e.get().get(key);
}
});
@@ -1413,7 +1413,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Map<K, V>> getAllOutTxAsync(List<K> keys) {
+ @Override public IgniteInternalFuture<Map<K, V>> getAllOutTxAsync(List<K> keys) {
String taskName = ctx.kernalContext().job().currentTaskName();
return getAllAsync(keys, !ctx.config().isReadFromBackup(), /*skip tx*/true, null, null, taskName, true);
@@ -1425,7 +1425,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<V> reloadAsync(K key) {
+ @Override public IgniteInternalFuture<V> reloadAsync(K key) {
return reloadAsync(key, (IgnitePredicate<CacheEntry<K, V>>[])null);
}
@@ -1435,7 +1435,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> reloadAllAsync(@Nullable Collection<? extends K> keys) {
+ @Override public IgniteInternalFuture<?> reloadAllAsync(@Nullable Collection<? extends K> keys) {
return reloadAllAsync(keys, (IgnitePredicate<CacheEntry<K, V>>[])null);
}
@@ -1447,7 +1447,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> reloadAllAsync() {
+ @Override public IgniteInternalFuture<?> reloadAllAsync() {
ctx.denyOnFlags(F.asList(LOCAL, READ));
return reloadAllAsync(keySet(), (IgnitePredicate<CacheEntry<K, V>>[])null);
@@ -1463,7 +1463,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
* @param vis Visitor.
* @return Future.
*/
- public IgniteFuture<Object> readThroughAllAsync(final Collection<? extends K> keys,
+ public IgniteInternalFuture<Object> readThroughAllAsync(final Collection<? extends K> keys,
boolean reload,
@Nullable final IgniteTxEx<K, V> tx,
IgnitePredicate<CacheEntry<K, V>>[] filter,
@@ -1506,7 +1506,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
* @param filter Filter.
* @return Future.
*/
- public IgniteFuture<Map<K, V>> reloadAllAsync(@Nullable Collection<? extends K> keys, boolean ret,
+ public IgniteInternalFuture<Map<K, V>> reloadAllAsync(@Nullable Collection<? extends K> keys, boolean ret,
@Nullable UUID subjId, String taskName, @Nullable final IgnitePredicate<CacheEntry<K, V>>... filter) {
ctx.denyOnFlag(READ);
@@ -1566,7 +1566,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
final Collection<K> loadedKeys = new GridConcurrentHashSet<>();
- IgniteFuture<Object> readFut =
+ IgniteInternalFuture<Object> readFut =
readThroughAllAsync(absentKeys, true, null, filter, subjId, taskName, new CI2<K, V>() {
/** Version for all loaded entries. */
private GridCacheVersion nextVer = ctx.versions().next();
@@ -1635,8 +1635,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
});
- return readFut.chain(new CX1<IgniteFuture<Object>, Map<K, V>>() {
- @Override public Map<K, V> applyx(IgniteFuture<Object> e) throws IgniteCheckedException {
+ return readFut.chain(new CX1<IgniteInternalFuture<Object>, Map<K, V>>() {
+ @Override public Map<K, V> applyx(IgniteInternalFuture<Object> e) throws IgniteCheckedException {
// Touch all not loaded keys.
for (K key : absentKeys) {
if (!loadedKeys.contains(key)) {
@@ -1705,18 +1705,18 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<V> getAsync(final K key) {
+ @Override public IgniteInternalFuture<V> getAsync(final K key) {
A.notNull(key, "key");
final boolean statsEnabled = ctx.config().isStatisticsEnabled();
final long start = statsEnabled ? System.nanoTime() : 0L;
- IgniteFuture<V> fut = getAsync(key, true, null);
+ IgniteInternalFuture<V> fut = getAsync(key, true, null);
if (ctx.config().getInterceptor() != null)
- fut = fut.chain(new CX1<IgniteFuture<V>, V>() {
- @Override public V applyx(IgniteFuture<V> f) throws IgniteCheckedException {
+ fut = fut.chain(new CX1<IgniteInternalFuture<V>, V>() {
+ @Override public V applyx(IgniteInternalFuture<V> f) throws IgniteCheckedException {
return (V)ctx.config().getInterceptor().onGet(key, f.get());
}
});
@@ -1747,18 +1747,18 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Map<K, V>> getAllAsync(@Nullable final Collection<? extends K> keys) {
+ @Override public IgniteInternalFuture<Map<K, V>> getAllAsync(@Nullable final Collection<? extends K> keys) {
A.notNull(keys, "keys");
final boolean statsEnabled = ctx.config().isStatisticsEnabled();
final long start = statsEnabled ? System.nanoTime() : 0L;
- IgniteFuture<Map<K, V>> fut = getAllAsync(keys, true, null);
+ IgniteInternalFuture<Map<K, V>> fut = getAllAsync(keys, true, null);
if (ctx.config().getInterceptor() != null)
- return fut.chain(new CX1<IgniteFuture<Map<K, V>>, Map<K, V>>() {
- @Override public Map<K, V> applyx(IgniteFuture<Map<K, V>> f) throws IgniteCheckedException {
+ return fut.chain(new CX1<IgniteInternalFuture<Map<K, V>>, Map<K, V>>() {
+ @Override public Map<K, V> applyx(IgniteInternalFuture<Map<K, V>> f) throws IgniteCheckedException {
return interceptGet(keys, f.get());
}
});
@@ -1811,7 +1811,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- protected IgniteFuture<Map<K, V>> getAllAsync(
+ protected IgniteInternalFuture<Map<K, V>> getAllAsync(
@Nullable Collection<? extends K> keys,
boolean forcePrimary,
boolean skipTx,
@@ -1838,7 +1838,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- public IgniteFuture<Map<K, V>> getAllAsync(@Nullable final Collection<? extends K> keys,
+ public IgniteInternalFuture<Map<K, V>> getAllAsync(@Nullable final Collection<? extends K> keys,
boolean readThrough,
@Nullable GridCacheEntryEx<K, V> cached,
boolean checkTx,
@@ -2054,8 +2054,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
return map;
}
}), true),
- new C2<Map<K, V>, Exception, IgniteFuture<Map<K, V>>>() {
- @Override public IgniteFuture<Map<K, V>> apply(Map<K, V> map, Exception e) {
+ new C2<Map<K, V>, Exception, IgniteInternalFuture<Map<K, V>>>() {
+ @Override public IgniteInternalFuture<Map<K, V>> apply(Map<K, V> map, Exception e) {
if (e != null)
return new GridFinishedFuture<>(ctx.kernalContext(), e);
@@ -2115,7 +2115,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
final GridCacheEntryEx<K, V> cached0 = cached;
return asyncOp(tx, new AsyncOp<Map<K, V>>(keys) {
- @Override public IgniteFuture<Map<K, V>> op(IgniteTxLocalAdapter<K, V> tx) {
+ @Override public IgniteInternalFuture<Map<K, V>> op(IgniteTxLocalAdapter<K, V> tx) {
return ctx.wrapCloneMap(tx.getAllAsync(ctx, keys, cached0, deserializePortable, filter));
}
});
@@ -2186,13 +2186,13 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<V> putAsync(K key, V val,
+ @Override public IgniteInternalFuture<V> putAsync(K key, V val,
@Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) {
final boolean statsEnabled = ctx.config().isStatisticsEnabled();
final long start = statsEnabled ? System.nanoTime() : 0L;
- IgniteFuture<V> fut = putAsync(key, val, null, -1, filter);
+ IgniteInternalFuture<V> fut = putAsync(key, val, null, -1, filter);
if (statsEnabled)
fut.listenAsync(new UpdatePutAndGetTimeStatClosure<V>(metrics0(), start));
@@ -2201,7 +2201,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<V> putAsync(final K key, final V val, @Nullable final GridCacheEntryEx<K, V> entry,
+ @Override public IgniteInternalFuture<V> putAsync(final K key, final V val, @Nullable final GridCacheEntryEx<K, V> entry,
final long ttl, @Nullable final IgnitePredicate<CacheEntry<K, V>>... filter) {
A.notNull(key, "key", val, "val");
@@ -2213,9 +2213,9 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
ctx.denyOnLocalRead();
return ctx.wrapClone(asyncOp(new AsyncOp<V>(key) {
- @Override public IgniteFuture<V> op(IgniteTxLocalAdapter<K, V> tx) {
+ @Override public IgniteInternalFuture<V> op(IgniteTxLocalAdapter<K, V> tx) {
return tx.putAllAsync(ctx, F.t(key, val), true, entry, ttl, filter)
- .chain((IgniteClosure<IgniteFuture<GridCacheReturn<V>>, V>)RET2VAL);
+ .chain((IgniteClosure<IgniteInternalFuture<GridCacheReturn<V>>, V>)RET2VAL);
}
@Override public String toString() {
@@ -2279,7 +2279,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> putAllDrAsync(final Map<? extends K, GridCacheDrInfo<V>> drMap)
+ @Override public IgniteInternalFuture<?> putAllDrAsync(final Map<? extends K, GridCacheDrInfo<V>> drMap)
throws IgniteCheckedException {
if (F.isEmpty(drMap))
return new GridFinishedFuture<Object>(ctx.kernalContext());
@@ -2289,7 +2289,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
ctx.denyOnLocalRead();
return asyncOp(new AsyncInOp(drMap.keySet()) {
- @Override public IgniteFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx) {
+ @Override public IgniteInternalFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx) {
return tx.putAllDrAsync(ctx, drMap);
}
@@ -2317,7 +2317,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
Map<? extends K, EntryProcessor<K, V, Object>> invokeMap =
Collections.singletonMap(key, (EntryProcessor<K, V, Object>)entryProcessor);
- IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut =
+ IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut =
tx.invokeAsync(ctx, invokeMap, args);
Map<K, EntryProcessorResult<T>> resMap = fut.get().value();
@@ -2353,7 +2353,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
});
- IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut =
+ IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut =
tx.invokeAsync(ctx, invokeMap, args);
Map<K, EntryProcessorResult<T>> res = fut.get().value();
@@ -2364,7 +2364,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public <T> IgniteFuture<EntryProcessorResult<T>> invokeAsync(
+ @Override public <T> IgniteInternalFuture<EntryProcessorResult<T>> invokeAsync(
final K key,
final EntryProcessor<K, V, T> entryProcessor,
final Object... args)
@@ -2376,8 +2376,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
ctx.denyOnLocalRead();
- IgniteFuture<?> fut = asyncOp(new AsyncInOp(key) {
- @Override public IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> inOp(IgniteTxLocalAdapter<K, V> tx) {
+ IgniteInternalFuture<?> fut = asyncOp(new AsyncInOp(key) {
+ @Override public IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> inOp(IgniteTxLocalAdapter<K, V> tx) {
Map<? extends K, EntryProcessor<K, V, Object>> invokeMap =
Collections.singletonMap(key, (EntryProcessor<K, V, Object>)entryProcessor);
@@ -2389,11 +2389,11 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
});
- IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut0 =
- (IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>)fut;
+ IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut0 =
+ (IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>)fut;
- return fut0.chain(new CX1<IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>, EntryProcessorResult<T>>() {
- @Override public EntryProcessorResult<T> applyx(IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut)
+ return fut0.chain(new CX1<IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>, EntryProcessorResult<T>>() {
+ @Override public EntryProcessorResult<T> applyx(IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut)
throws IgniteCheckedException {
GridCacheReturn<Map<K, EntryProcessorResult<T>>> ret = fut.get();
@@ -2411,7 +2411,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public <T> IgniteFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync(
+ @Override public <T> IgniteInternalFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync(
final Set<? extends K> keys,
final EntryProcessor<K, V, T> entryProcessor,
final Object... args) {
@@ -2422,8 +2422,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
ctx.denyOnLocalRead();
- IgniteFuture<?> fut = asyncOp(new AsyncInOp(keys) {
- @Override public IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> inOp(IgniteTxLocalAdapter<K, V> tx) {
+ IgniteInternalFuture<?> fut = asyncOp(new AsyncInOp(keys) {
+ @Override public IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> inOp(IgniteTxLocalAdapter<K, V> tx) {
Map<? extends K, EntryProcessor<K, V, Object>> invokeMap = F.viewAsMap(keys, new C1<K, EntryProcessor<K, V, Object>>() {
@Override public EntryProcessor apply(K k) {
return entryProcessor;
@@ -2438,11 +2438,11 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
});
- IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut0 =
- (IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>)fut;
+ IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut0 =
+ (IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>)fut;
- return fut0.chain(new CX1<IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>, Map<K, EntryProcessorResult<T>>>() {
- @Override public Map<K, EntryProcessorResult<T>> applyx(IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut)
+ return fut0.chain(new CX1<IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>, Map<K, EntryProcessorResult<T>>>() {
+ @Override public Map<K, EntryProcessorResult<T>> applyx(IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut)
throws IgniteCheckedException {
GridCacheReturn<Map<K, EntryProcessorResult<T>>> ret = fut.get();
@@ -2454,7 +2454,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public <T> IgniteFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync(
+ @Override public <T> IgniteInternalFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync(
final Map<? extends K, ? extends EntryProcessor<K, V, T>> map,
final Object... args) {
A.notNull(map, "map");
@@ -2464,8 +2464,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
ctx.denyOnLocalRead();
- IgniteFuture<?> fut = asyncOp(new AsyncInOp(map.keySet()) {
- @Override public IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> inOp(IgniteTxLocalAdapter<K, V> tx) {
+ IgniteInternalFuture<?> fut = asyncOp(new AsyncInOp(map.keySet()) {
+ @Override public IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> inOp(IgniteTxLocalAdapter<K, V> tx) {
return tx.invokeAsync(ctx, (Map<? extends K, ? extends EntryProcessor<K, V, Object>>)map, args);
}
@@ -2474,12 +2474,12 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
});
- IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut0 =
- (IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>)fut;
+ IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut0 =
+ (IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>)fut;
- return fut0.chain(new CX1<IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>, Map<K, EntryProcessorResult<T>>>() {
+ return fut0.chain(new CX1<IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>>, Map<K, EntryProcessorResult<T>>>() {
@Override public Map<K, EntryProcessorResult<T>> applyx(
- IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut)
+ IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut)
throws IgniteCheckedException {
GridCacheReturn<Map<K, EntryProcessorResult<T>>> ret = fut.get();
@@ -2504,7 +2504,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
return syncOp(new SyncOp<Map<K, EntryProcessorResult<T>>>(map.size() == 1) {
@Nullable @Override public Map<K, EntryProcessorResult<T>> op(IgniteTxLocalAdapter tx)
throws IgniteCheckedException {
- IgniteFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut = tx.invokeAsync(ctx, map, args);
+ IgniteInternalFuture<GridCacheReturn<Map<K, EntryProcessorResult<T>>>> fut = tx.invokeAsync(ctx, map, args);
return fut.get().value();
}
@@ -2512,13 +2512,13 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> putxAsync(K key, V val,
+ @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val,
@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) {
final boolean statsEnabled = ctx.config().isStatisticsEnabled();
final long start = statsEnabled ? System.nanoTime() : 0L;
- IgniteFuture<Boolean> fut = putxAsync(key, val, null, -1, filter);
+ IgniteInternalFuture<Boolean> fut = putxAsync(key, val, null, -1, filter);
if (statsEnabled)
fut.listenAsync(new UpdatePutTimeStatClosure<Boolean>(metrics0(), start));
@@ -2527,7 +2527,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> putxAsync(final K key, final V val,
+ @Override public IgniteInternalFuture<Boolean> putxAsync(final K key, final V val,
@Nullable final GridCacheEntryEx<K, V> entry, final long ttl,
@Nullable final IgnitePredicate<CacheEntry<K, V>>... filter) {
A.notNull(key, "key", val, "val");
@@ -2540,9 +2540,9 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
ctx.denyOnLocalRead();
return asyncOp(new AsyncOp<Boolean>(key) {
- @Override public IgniteFuture<Boolean> op(IgniteTxLocalAdapter<K, V> tx) {
+ @Override public IgniteInternalFuture<Boolean> op(IgniteTxLocalAdapter<K, V> tx) {
return tx.putAllAsync(ctx, F.t(key, val), false, entry, ttl, filter).chain(
- (IgniteClosure<IgniteFuture<GridCacheReturn<V>>, Boolean>)RET2FLAG);
+ (IgniteClosure<IgniteInternalFuture<GridCacheReturn<V>>, Boolean>)RET2FLAG);
}
@Override public String toString() {
@@ -2574,7 +2574,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<V> putIfAbsentAsync(final K key, final V val) {
+ @Override public IgniteInternalFuture<V> putIfAbsentAsync(final K key, final V val) {
final boolean statsEnabled = ctx.config().isStatisticsEnabled();
final long start = statsEnabled ? System.nanoTime() : 0L;
@@ -2588,10 +2588,10 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
ctx.denyOnLocalRead();
- IgniteFuture<V> fut = ctx.wrapClone(asyncOp(new AsyncOp<V>(key) {
- @Override public IgniteFuture<V> op(IgniteTxLocalAdapter<K, V> tx) {
+ IgniteInternalFuture<V> fut = ctx.wrapClone(asyncOp(new AsyncOp<V>(key) {
+ @Override public IgniteInternalFuture<V> op(IgniteTxLocalAdapter<K, V> tx) {
return tx.putAllAsync(ctx, F.t(key, val), true, null, -1, ctx.noPeekArray())
- .chain((IgniteClosure<IgniteFuture<GridCacheReturn<V>>, V>)RET2VAL);
+ .chain((IgniteClosure<IgniteInternalFuture<GridCacheReturn<V>>, V>)RET2VAL);
}
@Override public String toString() {
@@ -2637,7 +2637,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> putxIfAbsentAsync(final K key, final V val) {
+ @Override public IgniteInternalFuture<Boolean> putxIfAbsentAsync(final K key, final V val) {
final boolean statsEnabled = ctx.config().isStatisticsEnabled();
final long start = statsEnabled ? System.nanoTime() : 0L;
@@ -2651,10 +2651,10 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
ctx.denyOnLocalRead();
- IgniteFuture<Boolean> fut = asyncOp(new AsyncOp<Boolean>(key) {
- @Override public IgniteFuture<Boolean> op(IgniteTxLocalAdapter<K, V> tx) {
+ IgniteInternalFuture<Boolean> fut = asyncOp(new AsyncOp<Boolean>(key) {
+ @Override public IgniteInternalFuture<Boolean> op(IgniteTxLocalAdapter<K, V> tx) {
return tx.putAllAsync(ctx, F.t(key, val), false, null, -1, ctx.noPeekArray()).chain(
- (IgniteClosure<IgniteFuture<GridCacheReturn<V>>, Boolean>)RET2FLAG);
+ (IgniteClosure<IgniteInternalFuture<GridCacheReturn<V>>, Boolean>)RET2FLAG);
}
@Override public String toString() {
@@ -2691,7 +2691,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<V> replaceAsync(final K key, final V val) {
+ @Override public IgniteInternalFuture<V> replaceAsync(final K key, final V val) {
final boolean statsEnabled = ctx.config().isStatisticsEnabled();
final long start = statsEnabled ? System.nanoTime() : 0L;
@@ -2705,10 +2705,10 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
ctx.denyOnLocalRead();
- IgniteFuture<V> fut = ctx.wrapClone(asyncOp(new AsyncOp<V>(key) {
- @Override public IgniteFuture<V> op(IgniteTxLocalAdapter<K, V> tx) {
+ IgniteInternalFuture<V> fut = ctx.wrapClone(asyncOp(new AsyncOp<V>(key) {
+ @Override public IgniteInternalFuture<V> op(IgniteTxLocalAdapter<K, V> tx) {
return tx.putAllAsync(ctx, F.t(key, val), true, null, -1, ctx.hasPeekArray()).chain(
- (IgniteClosure<IgniteFuture<GridCacheReturn<V>>, V>)RET2VAL);
+ (IgniteClosure<IgniteInternalFuture<GridCacheReturn<V>>, V>)RET2VAL);
}
@Override public String toString() {
@@ -2745,7 +2745,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> replacexAsync(final K key, final V val) {
+ @Override public IgniteInternalFuture<Boolean> replacexAsync(final K key, final V val) {
A.notNull(key, "key", val, "val");
if (keyCheck)
@@ -2756,9 +2756,9 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
ctx.denyOnLocalRead();
return asyncOp(new AsyncOp<Boolean>(key) {
- @Override public IgniteFuture<Boolean> op(IgniteTxLocalAdapter<K, V> tx) {
+ @Override public IgniteInternalFuture<Boolean> op(IgniteTxLocalAdapter<K, V> tx) {
return tx.putAllAsync(ctx, F.t(key, val), false, null, -1, ctx.hasPeekArray()).chain(
- (IgniteClosure<IgniteFuture<GridCacheReturn<V>>, Boolean>)RET2FLAG);
+ (IgniteClosure<IgniteInternalFuture<GridCacheReturn<V>>, Boolean>)RET2FLAG);
}
@Override public String toString() {
@@ -2797,7 +2797,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> replaceAsync(final K key, final V oldVal, final V newVal) {
+ @Override public IgniteInternalFuture<Boolean> replaceAsync(final K key, final V oldVal, final V newVal) {
final boolean statsEnabled = ctx.config().isStatisticsEnabled();
final long start = statsEnabled ? System.nanoTime() : 0L;
@@ -2813,8 +2813,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
ctx.denyOnLocalRead();
- IgniteFuture<Boolean> fut = asyncOp(new AsyncOp<Boolean>(key) {
- @Override public IgniteFuture<Boolean> op(IgniteTxLocalAdapter<K, V> tx) {
+ IgniteInternalFuture<Boolean> fut = asyncOp(new AsyncOp<Boolean>(key) {
+ @Override public IgniteInternalFuture<Boolean> op(IgniteTxLocalAdapter<K, V> tx) {
// Register before hiding in the filter.
if (ctx.deploymentEnabled()) {
try {
@@ -2826,7 +2826,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
return tx.putAllAsync(ctx, F.t(key, newVal), false, null, -1, ctx.equalsPeekArray(oldVal)).chain(
- (IgniteClosure<IgniteFuture<GridCacheReturn<V>>, Boolean>)RET2FLAG);
+ (IgniteClosure<IgniteInternalFuture<GridCacheReturn<V>>, Boolean>)RET2FLAG);
}
@Override public String toString() {
@@ -2872,7 +2872,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> putAllAsync(final Map<? extends K, ? extends V> m,
+ @Override public IgniteInternalFuture<?> putAllAsync(final Map<? extends K, ? extends V> m,
@Nullable final IgnitePredicate<CacheEntry<K, V>>... filter) {
if (F.isEmpty(m))
return new GridFinishedFuture<Object>(ctx.kernalContext());
@@ -2885,7 +2885,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
ctx.denyOnLocalRead();
return asyncOp(new AsyncInOp(m.keySet()) {
- @Override public IgniteFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx) {
+ @Override public IgniteInternalFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx) {
return tx.putAllAsync(ctx, m, false, null, -1, filter);
}
@@ -2937,12 +2937,12 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<V> removeAsync(K key, IgnitePredicate<CacheEntry<K, V>>... filter) {
+ @Override public IgniteInternalFuture<V> removeAsync(K key, IgnitePredicate<CacheEntry<K, V>>... filter) {
final boolean statsEnabled = ctx.config().isStatisticsEnabled();
final long start = statsEnabled ? System.nanoTime() : 0L;
- IgniteFuture<V> fut = removeAsync(key, null, filter);
+ IgniteInternalFuture<V> fut = removeAsync(key, null, filter);
if (statsEnabled)
fut.listenAsync(new UpdateRemoveTimeStatClosure<V>(metrics0(), start));
@@ -2951,7 +2951,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<V> removeAsync(final K key, @Nullable final GridCacheEntryEx<K, V> entry,
+ @Override public IgniteInternalFuture<V> removeAsync(final K key, @Nullable final GridCacheEntryEx<K, V> entry,
@Nullable final IgnitePredicate<CacheEntry<K, V>>... filter) {
final boolean statsEnabled = ctx.config().isStatisticsEnabled();
@@ -2964,11 +2964,11 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
if (keyCheck)
validateCacheKey(key);
- IgniteFuture<V> fut = ctx.wrapClone(asyncOp(new AsyncOp<V>(key) {
- @Override public IgniteFuture<V> op(IgniteTxLocalAdapter<K, V> tx) {
+ IgniteInternalFuture<V> fut = ctx.wrapClone(asyncOp(new AsyncOp<V>(key) {
+ @Override public IgniteInternalFuture<V> op(IgniteTxLocalAdapter<K, V> tx) {
// TODO should we invoke interceptor here?
return tx.removeAllAsync(ctx, Collections.singletonList(key), null, true, filter)
- .chain((IgniteClosure<IgniteFuture<GridCacheReturn<V>>, V>) RET2VAL);
+ .chain((IgniteClosure<IgniteInternalFuture<GridCacheReturn<V>>, V>) RET2VAL);
}
@Override public String toString() {
@@ -3025,7 +3025,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> removeAllAsync(@Nullable final Collection<? extends K> keys,
+ @Override public IgniteInternalFuture<?> removeAllAsync(@Nullable final Collection<? extends K> keys,
final IgnitePredicate<CacheEntry<K, V>>... filter) {
final boolean statsEnabled = ctx.config().isStatisticsEnabled();
@@ -3039,8 +3039,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
ctx.denyOnLocalRead();
- IgniteFuture<Object> fut = asyncOp(new AsyncInOp(keys) {
- @Override public IgniteFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx) {
+ IgniteInternalFuture<Object> fut = asyncOp(new AsyncInOp(keys) {
+ @Override public IgniteInternalFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx) {
return tx.removeAllAsync(ctx, keys, null, false, filter);
}
@@ -3101,14 +3101,14 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> removexAsync(K key, IgnitePredicate<CacheEntry<K, V>>... filter) {
+ @Override public IgniteInternalFuture<Boolean> removexAsync(K key, IgnitePredicate<CacheEntry<K, V>>... filter) {
A.notNull(key, "key");
return removexAsync(key, null, filter);
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> removexAsync(final K key, @Nullable final GridCacheEntryEx<K, V> entry,
+ @Override public IgniteInternalFuture<Boolean> removexAsync(final K key, @Nullable final GridCacheEntryEx<K, V> entry,
@Nullable final IgnitePredicate<CacheEntry<K, V>>... filter) {
final boolean statsEnabled = ctx.config().isStatisticsEnabled();
@@ -3121,10 +3121,10 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
if (keyCheck)
validateCacheKey(key);
- IgniteFuture<Boolean> fut = asyncOp(new AsyncOp<Boolean>(key) {
- @Override public IgniteFuture<Boolean> op(IgniteTxLocalAdapter<K, V> tx) {
+ IgniteInternalFuture<Boolean> fut = asyncOp(new AsyncOp<Boolean>(key) {
+ @Override public IgniteInternalFuture<Boolean> op(IgniteTxLocalAdapter<K, V> tx) {
return tx.removeAllAsync(ctx, Collections.singletonList(key), entry, false, filter).chain(
- (IgniteClosure<IgniteFuture<GridCacheReturn<V>>, Boolean>)RET2FLAG);
+ (IgniteClosure<IgniteInternalFuture<GridCacheReturn<V>>, Boolean>)RET2FLAG);
}
@Override public String toString() {
@@ -3184,7 +3184,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> removeAllDrAsync(final Map<? extends K, GridCacheVersion> drMap)
+ @Override public IgniteInternalFuture<?> removeAllDrAsync(final Map<? extends K, GridCacheVersion> drMap)
throws IgniteCheckedException {
ctx.denyOnLocalRead();
@@ -3194,7 +3194,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
ctx.dr().onReceiveCacheEntriesReceived(drMap.size());
return asyncOp(new AsyncInOp(drMap.keySet()) {
- @Override public IgniteFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx) {
+ @Override public IgniteInternalFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx) {
return tx.removeAllDrAsync(ctx, drMap);
}
@@ -3229,7 +3229,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<GridCacheReturn<V>> removexAsync(final K key, final V val) {
+ @Override public IgniteInternalFuture<GridCacheReturn<V>> removexAsync(final K key, final V val) {
ctx.denyOnLocalRead();
A.notNull(key, "key", val, "val");
@@ -3238,7 +3238,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
validateCacheKey(key);
return asyncOp(new AsyncOp<GridCacheReturn<V>>(key) {
- @Override public IgniteFuture<GridCacheReturn<V>> op(IgniteTxLocalAdapter<K, V> tx) {
+ @Override public IgniteInternalFuture<GridCacheReturn<V>> op(IgniteTxLocalAdapter<K, V> tx) {
// Register before hiding in the filter.
try {
if (ctx.deploymentEnabled())
@@ -3259,7 +3259,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<GridCacheReturn<V>> replacexAsync(final K key, final V oldVal, final V newVal) {
+ @Override public IgniteInternalFuture<GridCacheReturn<V>> replacexAsync(final K key, final V oldVal, final V newVal) {
A.notNull(key, "key", oldVal, "oldVal", newVal, "newVal");
if (keyCheck)
@@ -3268,7 +3268,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
ctx.denyOnLocalRead();
return asyncOp(new AsyncOp<GridCacheReturn<V>>(key) {
- @Override public IgniteFuture<GridCacheReturn<V>> op(IgniteTxLocalAdapter<K, V> tx) {
+ @Override public IgniteInternalFuture<GridCacheReturn<V>> op(IgniteTxLocalAdapter<K, V> tx) {
// Register before hiding in the filter.
try {
if (ctx.deploymentEnabled())
@@ -3329,7 +3329,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> removeAsync(final K key, final V val) {
+ @Override public IgniteInternalFuture<Boolean> removeAsync(final K key, final V val) {
final boolean statsEnabled = ctx.config().isStatisticsEnabled();
final long start = statsEnabled ? System.nanoTime() : 0L;
@@ -3343,8 +3343,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
validateCacheValue(val);
- IgniteFuture<Boolean> fut = asyncOp(new AsyncOp<Boolean>(key) {
- @Override public IgniteFuture<Boolean> op(IgniteTxLocalAdapter<K, V> tx) {
+ IgniteInternalFuture<Boolean> fut = asyncOp(new AsyncOp<Boolean>(key) {
+ @Override public IgniteInternalFuture<Boolean> op(IgniteTxLocalAdapter<K, V> tx) {
// Register before hiding in the filter.
if (ctx.deploymentEnabled()) {
try {
@@ -3368,7 +3368,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
return tx.removeAllAsync(ctx, Collections.singletonList(key0), null, false,
ctx.vararg(F.<K, V>cacheContainsPeek(val))).chain(
- (IgniteClosure<IgniteFuture<GridCacheReturn<V>>, Boolean>)RET2FLAG);
+ (IgniteClosure<IgniteInternalFuture<GridCacheReturn<V>>, Boolean>)RET2FLAG);
}
@Override public String toString() {
@@ -3403,13 +3403,13 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> removeAllAsync(final IgnitePredicate<CacheEntry<K, V>>... filter) {
+ @Override public IgniteInternalFuture<?> removeAllAsync(final IgnitePredicate<CacheEntry<K, V>>... filter) {
ctx.denyOnLocalRead();
final Set<? extends K> keys = keySet(filter);
return asyncOp(new AsyncInOp(keys) {
- @Override public IgniteFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx) {
+ @Override public IgniteInternalFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx) {
return tx.removeAllAsync(ctx, keys, null, false, null);
}
@@ -3460,7 +3460,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
if (keyCheck)
validateCacheKeys(keys);
- IgniteFuture<Boolean> fut = lockAllAsync(keys, timeout, filter);
+ IgniteInternalFuture<Boolean> fut = lockAllAsync(keys, timeout, filter);
boolean isInterrupted = false;
@@ -3482,7 +3482,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> lockAsync(K key, long timeout,
+ @Override public IgniteInternalFuture<Boolean> lockAsync(K key, long timeout,
@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) {
A.notNull(key, "key");
@@ -3690,7 +3690,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> loadCacheAsync(final IgniteBiPredicate<K, V> p, final long ttl, final Object[] args) {
+ @Override public IgniteInternalFuture<?> loadCacheAsync(final IgniteBiPredicate<K, V> p, final long ttl, final Object[] args) {
return ctx.closures().callLocalSafe(
ctx.projectSafe(new Callable<Object>() {
@Nullable @Override public Object call() throws IgniteCheckedException {
@@ -3706,7 +3706,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
* @param replaceExisting Replace existing values flag.
* @return Load future.
*/
- public IgniteFuture<?> loadAll(
+ public IgniteInternalFuture<?> loadAll(
final Set<? extends K> keys,
boolean replaceExisting
) {
@@ -3831,7 +3831,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
* @param args Arguments.
* @throws IgniteCheckedException If failed.
*/
- IgniteFuture<?> globalLoadCacheAsync(@Nullable IgniteBiPredicate<K, V> p, @Nullable Object... args)
+ IgniteInternalFuture<?> globalLoadCacheAsync(@Nullable IgniteBiPredicate<K, V> p, @Nullable Object... args)
throws IgniteCheckedException {
ClusterGroup nodes = ctx.kernalContext().grid().cluster().forCache(ctx.name());
@@ -4043,18 +4043,18 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
* @return Transaction commit future.
*/
@SuppressWarnings("unchecked")
- public IgniteFuture<IgniteTx> commitTxAsync(final IgniteTxEx tx) {
+ public IgniteInternalFuture<IgniteTx> commitTxAsync(final IgniteTxEx tx) {
FutureHolder holder = lastFut.get();
holder.lock();
try {
- IgniteFuture fut = holder.future();
+ IgniteInternalFuture fut = holder.future();
if (fut != null && !fut.isDone()) {
- IgniteFuture<IgniteTx> f = new GridEmbeddedFuture<>(fut,
- new C2<Object, Exception, IgniteFuture<IgniteTx>>() {
- @Override public IgniteFuture<IgniteTx> apply(Object o, Exception e) {
+ IgniteInternalFuture<IgniteTx> f = new GridEmbeddedFuture<>(fut,
+ new C2<Object, Exception, IgniteInternalFuture<IgniteTx>>() {
+ @Override public IgniteInternalFuture<IgniteTx> apply(Object o, Exception e) {
return tx.commitAsync();
}
}, ctx.kernalContext());
@@ -4064,7 +4064,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
return f;
}
- IgniteFuture<IgniteTx> f = tx.commitAsync();
+ IgniteInternalFuture<IgniteTx> f = tx.commitAsync();
saveFuture(holder, f);
@@ -4120,7 +4120,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
public void awaitLastFut() {
FutureHolder holder = lastFut.get();
- IgniteFuture fut = holder.future();
+ IgniteInternalFuture fut = holder.future();
if (fut != null && !fut.isDone()) {
try {
@@ -4145,7 +4145,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
// Send job to remote nodes only.
Collection<ClusterNode> nodes = ctx.grid().forCache(name()).forRemotes().nodes();
- IgniteFuture<Collection<Integer>> fut = null;
+ IgniteInternalFuture<Collection<Integer>> fut = null;
if (!nodes.isEmpty()) {
ctx.kernalContext().task().setThreadContext(TC_TIMEOUT, gridCfg.getNetworkTimeout());
@@ -4255,7 +4255,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
* @return Future.
*/
@SuppressWarnings("unchecked")
- private <T> IgniteFuture<T> asyncOp(final AsyncOp<T> op) {
+ private <T> IgniteInternalFuture<T> asyncOp(final AsyncOp<T> op) {
try {
checkJta();
}
@@ -4296,8 +4296,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
* @return Future.
*/
@SuppressWarnings("unchecked")
- protected <T> IgniteFuture<T> asyncOp(IgniteTxLocalAdapter<K, V> tx, final AsyncOp<T> op) {
- IgniteFuture<T> fail = asyncOpAcquire();
+ protected <T> IgniteInternalFuture<T> asyncOp(IgniteTxLocalAdapter<K, V> tx, final AsyncOp<T> op) {
+ IgniteInternalFuture<T> fail = asyncOpAcquire();
if (fail != null)
return fail;
@@ -4307,14 +4307,14 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
holder.lock();
try {
- IgniteFuture fut = holder.future();
+ IgniteInternalFuture fut = holder.future();
if (fut != null && !fut.isDone()) {
final IgniteTxLocalAdapter<K, V> tx0 = tx;
- IgniteFuture<T> f = new GridEmbeddedFuture<>(fut,
- new C2<T, Exception, IgniteFuture<T>>() {
- @Override public IgniteFuture<T> apply(T t, Exception e) {
+ IgniteInternalFuture<T> f = new GridEmbeddedFuture<>(fut,
+ new C2<T, Exception, IgniteInternalFuture<T>>() {
+ @Override public IgniteInternalFuture<T> apply(T t, Exception e) {
return op.op(tx0);
}
}, ctx.kernalContext());
@@ -4324,7 +4324,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
return f;
}
- IgniteFuture<T> f = op.op(tx);
+ IgniteInternalFuture<T> f = op.op(tx);
saveFuture(holder, f);
@@ -4345,7 +4345,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
* @param holder Future holder.
* @param fut Future to save.
*/
- protected void saveFuture(final FutureHolder holder, IgniteFuture<?> fut) {
+ protected void saveFuture(final FutureHolder holder, IgniteInternalFuture<?> fut) {
assert holder != null;
assert fut != null;
assert holder.holdsLock();
@@ -4358,8 +4358,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
asyncOpRelease();
}
else {
- fut.listenAsync(new CI1<IgniteFuture<?>>() {
- @Override public void apply(IgniteFuture<?> f) {
+ fut.listenAsync(new CI1<IgniteInternalFuture<?>>() {
+ @Override public void apply(IgniteInternalFuture<?> f) {
asyncOpRelease();
if (!holder.tryLock())
@@ -4382,7 +4382,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
*
* @return Failed future if waiting was interrupted.
*/
- @Nullable protected <T> IgniteFuture<T> asyncOpAcquire() {
+ @Nullable protected <T> IgniteInternalFuture<T> asyncOpAcquire() {
try {
if (asyncOpsSem != null)
asyncOpsSem.acquire();
@@ -4441,7 +4441,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteFuture<?> forceRepartition() {
+ @Override public IgniteInternalFuture<?> forceRepartition() {
ctx.preloader().forcePreload();
return ctx.preloader().syncFuture();
@@ -4829,7 +4829,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
* @param filter Filter to evaluate.
* @return Read operation future.
*/
- public final IgniteFuture<V> getAsync(final K key, boolean deserializePortable,
+ public final IgniteInternalFuture<V> getAsync(final K key, boolean deserializePortable,
@Nullable IgnitePredicate<CacheEntry<K, V>> filter) {
ctx.denyOnFlag(LOCAL);
@@ -4840,9 +4840,9 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
return new GridFinishedFuture<>(ctx.kernalContext(), e);
}
- return getAllAsync(Collections.singletonList(key), deserializePortable, filter).chain(new CX1<IgniteFuture<Map<K, V>>, V>() {
+ return getAllAsync(Collections.singletonList(key), deserializePortable, filter).chain(new CX1<IgniteInternalFuture<Map<K, V>>, V>() {
@Override
- public V applyx(IgniteFuture<Map<K, V>> e) throws IgniteCheckedException {
+ public V applyx(IgniteInternalFuture<Map<K, V>> e) throws IgniteCheckedException {
return e.get().get(key);
}
});
@@ -4913,7 +4913,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
* @param filter Filter to evaluate.
* @return Reload future.
*/
- public IgniteFuture<?> reloadAllAsync(@Nullable Collection<? extends K> keys,
+ public IgniteInternalFuture<?> reloadAllAsync(@Nullable Collection<? extends K> keys,
@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) {
UUID subjId = ctx.subjectIdPerCall(null);
@@ -4927,7 +4927,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
* @param filter Filter to evaluate.
* @return Reload future.
*/
- public IgniteFuture<V> reloadAsync(final K key,
+ public IgniteInternalFuture<V> reloadAsync(final K key,
@Nullable final IgnitePredicate<CacheEntry<K, V>>... filter) {
ctx.denyOnFlags(F.asList(LOCAL, READ));
@@ -4956,7 +4956,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
* @param filter Filter to evaluate.
* @return Reload future.
*/
- public IgniteFuture<?> reloadAllAsync(@Nullable final IgnitePredicate<CacheEntry<K, V>> filter) {
+ public IgniteInternalFuture<?> reloadAllAsync(@Nullable final IgnitePredicate<CacheEntry<K, V>> filter) {
ctx.denyOnFlag(READ);
return ctx.closures().callLocalSafe(ctx.projectSafe(new GPC() {
@@ -4974,7 +4974,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
* @param filter Filter to evaluate.
* @return Read future.
*/
- public IgniteFuture<Map<K, V>> getAllAsync(@Nullable Collection<? extends K> keys,
+ public IgniteInternalFuture<Map<K, V>> getAllAsync(@Nullable Collection<? extends K> keys,
boolean deserializePortable,
@Nullable IgnitePredicate<CacheEntry<K, V>> filter) {
String taskName = ctx.kernalContext().job().currentTaskName();
@@ -5183,7 +5183,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
* @param tx Transaction.
* @return Operation return value.
*/
- public abstract IgniteFuture<T> op(IgniteTxLocalAdapter<K, V> tx);
+ public abstract IgniteInternalFuture<T> op(IgniteTxLocalAdapter<K, V> tx);
}
/**
@@ -5206,15 +5206,15 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
/** {@inheritDoc} */
@SuppressWarnings({"unchecked"})
- @Override public final IgniteFuture<Object> op(IgniteTxLocalAdapter<K, V> tx) {
- return (IgniteFuture<Object>)inOp(tx);
+ @Override public final IgniteInternalFuture<Object> op(IgniteTxLocalAdapter<K, V> tx) {
+ return (IgniteInternalFuture<Object>)inOp(tx);
}
/**
* @param tx Transaction.
* @return Operation return value.
*/
- public abstract IgniteFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx);
+ public abstract IgniteInternalFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx);
}
/**
@@ -5328,7 +5328,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
private final ReentrantLock lock = new ReentrantLock();
/** Future. */
- private IgniteFuture fut;
+ private IgniteInternalFuture fut;
/**
* Tries to acquire lock.
@@ -5366,7 +5366,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
*
* @return Future.
*/
- public IgniteFuture future() {
+ public IgniteInternalFuture future() {
return fut;
}
@@ -5375,7 +5375,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
*
* @param fut Future.
*/
- public void future(@Nullable IgniteFuture fut) {
+ public void future(@Nullable IgniteInternalFuture fut) {
this.fut = fut;
}
}
@@ -5707,7 +5707,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
/**
*
*/
- protected static abstract class UpdateTimeStatClosure<T> implements CI1<IgniteFuture<T>> {
+ protected static abstract class UpdateTimeStatClosure<T> implements CI1<IgniteInternalFuture<T>> {
/** */
protected final CacheMetricsImpl metrics;
@@ -5724,7 +5724,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public void apply(IgniteFuture<T> fut) {
+ @Override public void apply(IgniteInternalFuture<T> fut) {
try {
if (!fut.isCancelled()) {
fut.get();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
index d1c1a70..5d02248 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
@@ -20,8 +20,8 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.*;
-import org.apache.ignite.lang.*;
import org.apache.ignite.internal.processors.affinity.*;
import org.apache.ignite.internal.util.future.*;
import org.apache.ignite.internal.util.typedef.*;
@@ -98,10 +98,10 @@ public class GridCacheAffinityManager<K, V> extends GridCacheManagerAdapter<K, V
* @param topVer Topology version to wait.
* @return Affinity ready future.
*/
- public IgniteFuture<Long> affinityReadyFuture(long topVer) {
+ public IgniteInternalFuture<Long> affinityReadyFuture(long topVer) {
assert !cctx.isLocal();
- IgniteFuture<Long> fut = aff.readyFuture(topVer);
+ IgniteInternalFuture<Long> fut = aff.readyFuture(topVer);
return fut != null ? fut : new GridFinishedFutureEx<>(topVer);
}
@@ -113,7 +113,7 @@ public class GridCacheAffinityManager<K, V> extends GridCacheManagerAdapter<K, V
* @param topVer Topology version to wait.
* @return Affinity ready future or {@code null}.
*/
- @Nullable public IgniteFuture<Long> affinityReadyFuturex(long topVer) {
+ @Nullable public IgniteInternalFuture<Long> affinityReadyFuturex(long topVer) {
assert !cctx.isLocal();
return aff.readyFuture(topVer);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/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 3fb5329..0336832 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
@@ -1278,12 +1278,12 @@ public class GridCacheContext<K, V> implements Externalizable {
* @param f Target future.
* @return Wrapped future that is aware of cloning behaviour.
*/
- public IgniteFuture<V> wrapClone(IgniteFuture<V> f) {
+ public IgniteInternalFuture<V> wrapClone(IgniteInternalFuture<V> f) {
if (!hasFlag(CLONE))
return f;
- return f.chain(new CX1<IgniteFuture<V>, V>() {
- @Override public V applyx(IgniteFuture<V> f) throws IgniteCheckedException {
+ return f.chain(new CX1<IgniteInternalFuture<V>, V>() {
+ @Override public V applyx(IgniteInternalFuture<V> f) throws IgniteCheckedException {
return cloneValue(f.get());
}
});
@@ -1293,12 +1293,12 @@ public class GridCacheContext<K, V> implements Externalizable {
* @param f Target future.
* @return Wrapped future that is aware of cloning behaviour.
*/
- public IgniteFuture<Map<K, V>> wrapCloneMap(IgniteFuture<Map<K, V>> f) {
+ public IgniteInternalFuture<Map<K, V>> wrapCloneMap(IgniteInternalFuture<Map<K, V>> f) {
if (!hasFlag(CLONE))
return f;
- return f.chain(new CX1<IgniteFuture<Map<K, V>>, Map<K, V>>() {
- @Override public Map<K, V> applyx(IgniteFuture<Map<K, V>> f) throws IgniteCheckedException {
+ return f.chain(new CX1<IgniteInternalFuture<Map<K, V>>, Map<K, V>>() {
+ @Override public Map<K, V> applyx(IgniteInternalFuture<Map<K, V>> f) throws IgniteCheckedException {
Map<K, V> map = new GridLeanMap<>();
for (Map.Entry<K, V> e : f.get().entrySet())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java
index 6d59e26..f018a8a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.internal.processors.cache.distributed.dht.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
@@ -377,7 +378,7 @@ public class GridCacheEntryImpl<K, V> implements CacheEntry<K, V>, Externalizabl
}
/** {@inheritDoc} */
- @Override public IgniteFuture<V> reloadAsync() {
+ @Override public IgniteInternalFuture<V> reloadAsync() {
GridCacheProjectionImpl<K, V> old = ctx.gate().enter(proxy.gateProjection());
try {
@@ -409,7 +410,7 @@ public class GridCacheEntryImpl<K, V> implements CacheEntry<K, V>, Externalizabl
}
/** {@inheritDoc} */
- @Override public IgniteFuture<V> getAsync() {
+ @Override public IgniteInternalFuture<V> getAsync() {
return proxy.getAsync(key);
}
@@ -420,7 +421,7 @@ public class GridCacheEntryImpl<K, V> implements CacheEntry<K, V>, Externalizabl
}
/** {@inheritDoc} */
- @Override public IgniteFuture<V> setAsync(V val, IgnitePredicate<CacheEntry<K, V>>[] filter) {
+ @Override public IgniteInternalFuture<V> setAsync(V val, IgnitePredicate<CacheEntry<K, V>>[] filter) {
// Should not pass dht entries as to near cache.
return proxy.putAsync(key, val, isNearEnabled(ctx) ? null : cached, ttl, filter);
}
@@ -432,7 +433,7 @@ public class GridCacheEntryImpl<K, V> implements CacheEntry<K, V>, Externalizabl
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> setxAsync(V val, IgnitePredicate<CacheEntry<K, V>>[] filter) {
+ @Override public IgniteInternalFuture<Boolean> setxAsync(V val, IgnitePredicate<CacheEntry<K, V>>[] filter) {
// Should not pass dht entries as to near cache.
return proxy.putxAsync(key, val, isNearEnabled(ctx) ? null : cached, ttl, filter);
}
@@ -443,7 +444,7 @@ public class GridCacheEntryImpl<K, V> implements CacheEntry<K, V>, Externalizabl
}
/** {@inheritDoc} */
- @Override public IgniteFuture<V> replaceAsync(V val) {
+ @Override public IgniteInternalFuture<V> replaceAsync(V val) {
return setAsync(val, ctx.hasPeekArray());
}
@@ -453,7 +454,7 @@ public class GridCacheEntryImpl<K, V> implements CacheEntry<K, V>, Externalizabl
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> replaceAsync(V oldVal, V newVal) {
+ @Override public IgniteInternalFuture<Boolean> replaceAsync(V oldVal, V newVal) {
return setxAsync(newVal, ctx.equalsPeekArray(newVal));
}
@@ -499,7 +500,7 @@ public class GridCacheEntryImpl<K, V> implements CacheEntry<K, V>, Externalizabl
}
/** {@inheritDoc} */
- @Override public IgniteFuture<V> setIfAbsentAsync(V val) {
+ @Override public IgniteInternalFuture<V> setIfAbsentAsync(V val) {
return setAsync(val, ctx.noPeekArray());
}
@@ -509,7 +510,7 @@ public class GridCacheEntryImpl<K, V> implements CacheEntry<K, V>, Externalizabl
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> setxIfAbsentAsync(V val) {
+ @Override public IgniteInternalFuture<Boolean> setxIfAbsentAsync(V val) {
return setxAsync(val, ctx.noPeekArray());
}
@@ -519,7 +520,7 @@ public class GridCacheEntryImpl<K, V> implements CacheEntry<K, V>, Externalizabl
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> replacexAsync(V val) {
+ @Override public IgniteInternalFuture<Boolean> replacexAsync(V val) {
return setxAsync(val, ctx.hasPeekArray());
}
@@ -529,7 +530,7 @@ public class GridCacheEntryImpl<K, V> implements CacheEntry<K, V>, Externalizabl
}
/** {@inheritDoc} */
- @Override public IgniteFuture<V> removeAsync(IgnitePredicate<CacheEntry<K, V>>[] filter) {
+ @Override public IgniteInternalFuture<V> removeAsync(IgnitePredicate<CacheEntry<K, V>>[] filter) {
return proxy.removeAsync(key, isNearEnabled(ctx) ? null : cached, filter);
}
@@ -539,7 +540,7 @@ public class GridCacheEntryImpl<K, V> implements CacheEntry<K, V>, Externalizabl
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> removexAsync(IgnitePredicate<CacheEntry<K, V>>[] filter) {
+ @Override public IgniteInternalFuture<Boolean> removexAsync(IgnitePredicate<CacheEntry<K, V>>[] filter) {
return proxy.removexAsync(key, isNearEnabled(ctx) ? null : cached, filter);
}
@@ -549,7 +550,7 @@ public class GridCacheEntryImpl<K, V> implements CacheEntry<K, V>, Externalizabl
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> removeAsync(V val) {
+ @Override public IgniteInternalFuture<Boolean> removeAsync(V val) {
return proxy.removeAsync(key, val);
}
@@ -649,7 +650,7 @@ public class GridCacheEntryImpl<K, V> implements CacheEntry<K, V>, Externalizabl
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> lockAsync(long timeout,
+ @Override public IgniteInternalFuture<Boolean> lockAsync(long timeout,
@Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) {
return proxy.lockAsync(key, timeout, filter);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java
index f106337..20e6e74 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.internal.util.typedef.*;
@@ -212,7 +213,7 @@ public class GridCacheEvictionEntry<K, V> implements CacheEntry<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public IgniteFuture<V> reloadAsync() {
+ @Override public IgniteInternalFuture<V> reloadAsync() {
throw unsupported();
}
@@ -249,7 +250,7 @@ public class GridCacheEvictionEntry<K, V> implements CacheEntry<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public IgniteFuture<V> getAsync() {
+ @Override public IgniteInternalFuture<V> getAsync() {
throw unsupported();
}
@@ -259,7 +260,7 @@ public class GridCacheEvictionEntry<K, V> implements CacheEntry<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public IgniteFuture<V> setAsync(V val, IgnitePredicate<CacheEntry<K, V>>[] filter) {
+ @Override public IgniteInternalFuture<V> setAsync(V val, IgnitePredicate<CacheEntry<K, V>>[] filter) {
throw unsupported();
}
@@ -269,7 +270,7 @@ public class GridCacheEvictionEntry<K, V> implements CacheEntry<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> setxAsync(V val, IgnitePredicate<CacheEntry<K, V>>[] filter) {
+ @Override public IgniteInternalFuture<Boolean> setxAsync(V val, IgnitePredicate<CacheEntry<K, V>>[] filter) {
throw unsupported();
}
@@ -279,7 +280,7 @@ public class GridCacheEvictionEntry<K, V> implements CacheEntry<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public IgniteFuture<V> replaceAsync(V val) {
+ @Override public IgniteInternalFuture<V> replaceAsync(V val) {
throw unsupported();
}
@@ -289,7 +290,7 @@ public class GridCacheEvictionEntry<K, V> implements CacheEntry<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> replaceAsync(V oldVal, V newVal) {
+ @Override public IgniteInternalFuture<Boolean> replaceAsync(V oldVal, V newVal) {
throw unsupported();
}
@@ -309,7 +310,7 @@ public class GridCacheEvictionEntry<K, V> implements CacheEntry<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public IgniteFuture<V> setIfAbsentAsync(V val) {
+ @Override public IgniteInternalFuture<V> setIfAbsentAsync(V val) {
throw unsupported();
}
@@ -319,7 +320,7 @@ public class GridCacheEvictionEntry<K, V> implements CacheEntry<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> setxIfAbsentAsync(V val) {
+ @Override public IgniteInternalFuture<Boolean> setxIfAbsentAsync(V val) {
throw unsupported();
}
@@ -329,7 +330,7 @@ public class GridCacheEvictionEntry<K, V> implements CacheEntry<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> replacexAsync(V val) {
+ @Override public IgniteInternalFuture<Boolean> replacexAsync(V val) {
throw unsupported();
}
@@ -339,7 +340,7 @@ public class GridCacheEvictionEntry<K, V> implements CacheEntry<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public IgniteFuture<V> removeAsync(IgnitePredicate<CacheEntry<K, V>>[] filter) {
+ @Override public IgniteInternalFuture<V> removeAsync(IgnitePredicate<CacheEntry<K, V>>[] filter) {
throw unsupported();
}
@@ -349,7 +350,7 @@ public class GridCacheEvictionEntry<K, V> implements CacheEntry<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> removexAsync(IgnitePredicate<CacheEntry<K, V>>[] filter) {
+ @Override public IgniteInternalFuture<Boolean> removexAsync(IgnitePredicate<CacheEntry<K, V>>[] filter) {
throw unsupported();
}
@@ -359,7 +360,7 @@ public class GridCacheEvictionEntry<K, V> implements CacheEntry<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> removeAsync(V val) {
+ @Override public IgniteInternalFuture<Boolean> removeAsync(V val) {
throw unsupported();
}
@@ -417,7 +418,7 @@ public class GridCacheEvictionEntry<K, V> implements CacheEntry<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public IgniteFuture<Boolean> lockAsync(long timeout,
+ @Override public IgniteInternalFuture<Boolean> lockAsync(long timeout,
@Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) {
throw unsupported();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
index 1b44aca..837a6e4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
@@ -1067,8 +1067,8 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V
// Thread that prepares future should remove it and install listener.
curEvictFut.compareAndSet(fut, null);
- fut.listenAsync(new CI1<IgniteFuture<?>>() {
- @Override public void apply(IgniteFuture<?> f) {
+ fut.listenAsync(new CI1<IgniteInternalFuture<?>>() {
+ @Override public void apply(IgniteInternalFuture<?> f) {
if (!busyLock.enterBusy()) {
if (log.isDebugEnabled())
log.debug("Will not notify eviction future completion (grid is stopping): " +
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
index 2e8edfc..3c020a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
@@ -17,8 +17,8 @@
package org.apache.ignite.internal.processors.cache;
+import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.lang.*;
import org.apache.ignite.internal.managers.discovery.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
@@ -243,7 +243,7 @@ public class GridCacheExplicitLockSpan<K> extends ReentrantLock {
*
* @return Release future.
*/
- public IgniteFuture<Object> releaseFuture() {
+ public IgniteInternalFuture<Object> releaseFuture() {
return releaseFut;
}