http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFilterEvaluationEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFilterEvaluationEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFilterEvaluationEntry.java index be2af95..d5ea41f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFilterEvaluationEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFilterEvaluationEntry.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.util.typedef.internal.*; import org.jetbrains.annotations.*; @@ -117,7 +118,7 @@ public class GridCacheFilterEvaluationEntry<K, V> implements CacheEntry<K, V> { } /** {@inheritDoc} */ - @Override public IgniteFuture<V> getAsync() { + @Override public IgniteInternalFuture<V> getAsync() { throw new UnsupportedOperationException("getAsync"); } @@ -132,7 +133,7 @@ public class GridCacheFilterEvaluationEntry<K, V> implements CacheEntry<K, V> { } /** {@inheritDoc} */ - @Override public IgniteFuture<V> reloadAsync() { + @Override public IgniteInternalFuture<V> reloadAsync() { throw new UnsupportedOperationException("reloadAsync"); } @@ -209,7 +210,7 @@ public class GridCacheFilterEvaluationEntry<K, V> implements CacheEntry<K, V> { } /** {@inheritDoc} */ - @Override public IgniteFuture<V> setAsync(V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public IgniteInternalFuture<V> setAsync(V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { throw new UnsupportedOperationException("setAsync"); } @@ -219,7 +220,7 @@ public class GridCacheFilterEvaluationEntry<K, V> implements CacheEntry<K, V> { } /** {@inheritDoc} */ - @Override public IgniteFuture<V> setIfAbsentAsync(V val) { + @Override public IgniteInternalFuture<V> setIfAbsentAsync(V val) { throw new UnsupportedOperationException("setIfAbsentAsync"); } @@ -230,7 +231,7 @@ public class GridCacheFilterEvaluationEntry<K, V> implements CacheEntry<K, V> { } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> setxAsync(V val, + @Override public IgniteInternalFuture<Boolean> setxAsync(V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { throw new UnsupportedOperationException("setxAsync"); } @@ -241,7 +242,7 @@ public class GridCacheFilterEvaluationEntry<K, V> implements CacheEntry<K, V> { } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> setxIfAbsentAsync(V val) { + @Override public IgniteInternalFuture<Boolean> setxIfAbsentAsync(V val) { throw new UnsupportedOperationException("setxIfAbsentAsync"); } @@ -251,7 +252,7 @@ public class GridCacheFilterEvaluationEntry<K, V> implements CacheEntry<K, V> { } /** {@inheritDoc} */ - @Override public IgniteFuture<V> replaceAsync(V val) { + @Override public IgniteInternalFuture<V> replaceAsync(V val) { throw new UnsupportedOperationException("replaceAsync"); } @@ -261,7 +262,7 @@ public class GridCacheFilterEvaluationEntry<K, V> implements CacheEntry<K, V> { } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> replacexAsync(V val) { + @Override public IgniteInternalFuture<Boolean> replacexAsync(V val) { throw new UnsupportedOperationException("replacexAsync"); } @@ -271,7 +272,7 @@ public class GridCacheFilterEvaluationEntry<K, V> implements CacheEntry<K, V> { } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> replaceAsync(V oldVal, V newVal) { + @Override public IgniteInternalFuture<Boolean> replaceAsync(V oldVal, V newVal) { throw new UnsupportedOperationException("replaceAsync"); } @@ -282,7 +283,7 @@ public class GridCacheFilterEvaluationEntry<K, V> implements CacheEntry<K, V> { } /** {@inheritDoc} */ - @Override public IgniteFuture<V> removeAsync(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public IgniteInternalFuture<V> removeAsync(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { throw new UnsupportedOperationException("removeAsync"); } @@ -292,7 +293,7 @@ public class GridCacheFilterEvaluationEntry<K, V> implements CacheEntry<K, V> { } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> removexAsync(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public IgniteInternalFuture<Boolean> removexAsync(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { throw new UnsupportedOperationException("removexAsync"); } @@ -302,7 +303,7 @@ public class GridCacheFilterEvaluationEntry<K, V> implements CacheEntry<K, V> { } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> removeAsync(V val) { + @Override public IgniteInternalFuture<Boolean> removeAsync(V val) { throw new UnsupportedOperationException("removeAsync"); } @@ -329,7 +330,7 @@ public class GridCacheFilterEvaluationEntry<K, V> implements CacheEntry<K, V> { } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> lockAsync(long timeout, + @Override public IgniteInternalFuture<Boolean> lockAsync(long timeout, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { throw new UnsupportedOperationException("lockAsync"); }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFuture.java index df62cba..e836e99 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheFuture.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cluster.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.lang.*; @@ -26,7 +27,7 @@ import java.util.*; /** * This interface should be implemented by all distributed futures. */ -public interface GridCacheFuture<R> extends IgniteFuture<R> { +public interface GridCacheFuture<R> extends IgniteInternalFuture<R> { /** * @return Unique identifier for this future. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java index 837b162..3b7e2a0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cluster.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.lang.*; import org.apache.ignite.internal.managers.communication.*; @@ -112,13 +113,13 @@ public class GridCacheIoManager<K, V> extends GridCacheSharedManagerAdapter<K, V log.debug("Received message has higher topology version [msg=" + msg + ", locTopVer=" + locTopVer + ", rmtTopVer=" + rmtTopVer + ']'); - IgniteFuture<Long> topFut = cctx.discovery().topologyFuture(rmtTopVer); + IgniteInternalFuture<Long> topFut = cctx.discovery().topologyFuture(rmtTopVer); if (!topFut.isDone()) { final IgniteBiInClosure<UUID, GridCacheMessage<K, V>> c0 = c; - topFut.listenAsync(new CI1<IgniteFuture<Long>>() { - @Override public void apply(IgniteFuture<Long> t) { + topFut.listenAsync(new CI1<IgniteInternalFuture<Long>>() { + @Override public void apply(IgniteInternalFuture<Long> t) { onMessage0(nodeId, cacheMsg, c0); } }); @@ -203,7 +204,7 @@ public class GridCacheIoManager<K, V> extends GridCacheSharedManagerAdapter<K, V if (cacheMsg.allowForStartup()) processMessage(nodeId, cacheMsg, c); else { - IgniteFuture<?> startFut = startFuture(cacheMsg); + IgniteInternalFuture<?> startFut = startFuture(cacheMsg); if (startFut.isDone()) processMessage(nodeId, cacheMsg, c); @@ -213,8 +214,8 @@ public class GridCacheIoManager<K, V> extends GridCacheSharedManagerAdapter<K, V ", locId=" + cctx.localNodeId() + ", msg=" + cacheMsg + ']'); // Don't hold this thread waiting for preloading to complete. - startFut.listenAsync(new CI1<IgniteFuture<?>>() { - @Override public void apply(IgniteFuture<?> f) { + startFut.listenAsync(new CI1<IgniteInternalFuture<?>>() { + @Override public void apply(IgniteInternalFuture<?> f) { rw.readLock(); try { @@ -269,7 +270,7 @@ public class GridCacheIoManager<K, V> extends GridCacheSharedManagerAdapter<K, V * @param cacheMsg Cache message to get start future. * @return Preloader start future. */ - private IgniteFuture<Object> startFuture(GridCacheMessage<K, V> cacheMsg) { + private IgniteInternalFuture<Object> startFuture(GridCacheMessage<K, V> cacheMsg) { int cacheId = cacheMsg.cacheId(); return cacheId != 0 ? cctx.cacheContext(cacheId).preloader().startFuture() : cctx.preloadersStartFuture(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java index 0bfcf90..aa593f5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.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.*; -import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; import org.apache.ignite.internal.processors.cache.transactions.*; import org.apache.ignite.internal.util.typedef.*; @@ -103,8 +103,8 @@ public final class GridCacheMultiTxFuture<K, V> extends GridFutureAdapter<Boolea for (final IgniteTxEx<K, V> tx : txs) { if (!tx.done()) { - tx.finishFuture().listenAsync(new CI1<IgniteFuture<IgniteTx>>() { - @Override public void apply(IgniteFuture<IgniteTx> t) { + tx.finishFuture().listenAsync(new CI1<IgniteInternalFuture<IgniteTx>>() { + @Override public void apply(IgniteInternalFuture<IgniteTx> t) { remainingTxs.remove(tx); checkRemaining(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java index 2e8704d..9d69d95 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java @@ -20,6 +20,7 @@ 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.processors.cache.distributed.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.util.*; @@ -200,7 +201,7 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K, } } - for (IgniteFuture<?> fut : atomicFuts.values()) { + for (IgniteInternalFuture<?> fut : atomicFuts.values()) { if (fut instanceof GridCacheFuture) { GridCacheFuture cacheFut = (GridCacheFuture)fut; @@ -298,7 +299,7 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K, * @param fut Future. */ public void addAtomicFuture(GridCacheVersion futVer, GridCacheAtomicFuture<K, ?> fut) { - IgniteFuture<?> old = atomicFuts.put(futVer, fut); + IgniteInternalFuture<?> old = atomicFuts.put(futVer, fut); assert old == null; } @@ -316,7 +317,7 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K, * @param futVer Future ID. * @return Future. */ - @Nullable public IgniteFuture<?> atomicFuture(GridCacheVersion futVer) { + @Nullable public IgniteInternalFuture<?> atomicFuture(GridCacheVersion futVer) { return atomicFuts.get(futVer); } @@ -324,7 +325,7 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K, * @param futVer Future ID. * @return Removed future. */ - @Nullable public IgniteFuture<?> removeAtomicFuture(GridCacheVersion futVer) { + @Nullable public IgniteInternalFuture<?> removeAtomicFuture(GridCacheVersion futVer) { return atomicFuts.remove(futVer); } @@ -496,10 +497,10 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K, * @param ver Version. * @return All futures for given lock version. */ - public <T> Collection<? extends IgniteFuture<T>> futures(GridCacheVersion ver) { + public <T> Collection<? extends IgniteInternalFuture<T>> futures(GridCacheVersion ver) { Collection c = futs.get(ver); - return c == null ? Collections.<IgniteFuture<T>>emptyList() : (Collection<IgniteFuture<T>>)c; + return c == null ? Collections.<IgniteInternalFuture<T>>emptyList() : (Collection<IgniteInternalFuture<T>>)c; } /** @@ -902,7 +903,7 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K, * @return Future that signals when all locks for given partitions are released. */ @SuppressWarnings({"unchecked"}) - public IgniteFuture<?> finishLocks(long topVer) { + public IgniteInternalFuture<?> finishLocks(long topVer) { assert topVer > 0; return finishLocks(null, topVer); } @@ -914,7 +915,7 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K, * @param topVer Topology version to wait for. * @return Explicit locks release future. */ - public IgniteFuture<?> finishExplicitLocks(long topVer) { + public IgniteInternalFuture<?> finishExplicitLocks(long topVer) { GridCompoundFuture<Object, Object> res = new GridCompoundFuture<>(cctx.kernalContext()); for (GridCacheExplicitLockSpan<K> span : pendingExplicit.values()) { @@ -934,14 +935,14 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K, * * @return Finish update future. */ - public IgniteFuture<?> finishAtomicUpdates(long topVer) { + public IgniteInternalFuture<?> finishAtomicUpdates(long topVer) { GridCompoundFuture<Object, Object> res = new GridCompoundFuture<>(cctx.kernalContext()); res.ignoreChildFailures(ClusterTopologyException.class, CachePartialUpdateCheckedException.class); for (GridCacheAtomicFuture<K, ?> fut : atomicFuts.values()) { if (fut.waitForPartitionExchange() && fut.topologyVersion() < topVer) - res.add((IgniteFuture<Object>)fut); + res.add((IgniteInternalFuture<Object>)fut); } res.markInitialized(); @@ -955,7 +956,7 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K, * @return Future that signals when all locks for given keys are released. */ @SuppressWarnings("unchecked") - public IgniteFuture<?> finishKeys(Collection<K> keys, long topVer) { + public IgniteInternalFuture<?> finishKeys(Collection<K> keys, long topVer) { if (!(keys instanceof Set)) keys = new HashSet<>(keys); @@ -973,7 +974,7 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K, * @param topVer Topology version. * @return Future that signals when all locks for given partitions will be released. */ - private IgniteFuture<?> finishLocks(@Nullable final IgnitePredicate<K> keyFilter, long topVer) { + private IgniteInternalFuture<?> finishLocks(@Nullable final IgnitePredicate<K> keyFilter, long topVer) { assert topVer != 0; if (topVer < 0) @@ -993,8 +994,8 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K, finishFuts.add(finishFut); - finishFut.listenAsync(new CI1<IgniteFuture<?>>() { - @Override public void apply(IgniteFuture<?> e) { + finishFut.listenAsync(new CI1<IgniteInternalFuture<?>>() { + @Override public void apply(IgniteInternalFuture<?> e) { finishFuts.remove(finishFut); // This call is required to make sure that the concurrent queue http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/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 c1ab90b..4cb2d10 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 @@ -20,6 +20,7 @@ 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.thread.*; @@ -130,8 +131,8 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana if (log.isDebugEnabled()) log.debug("Discovery event (will start exchange): " + exchId); - locExchFut.listenAsync(new CI1<IgniteFuture<?>>() { - @Override public void apply(IgniteFuture<?> t) { + locExchFut.listenAsync(new CI1<IgniteInternalFuture<?>>() { + @Override public void apply(IgniteInternalFuture<?> t) { if (!enterBusy()) return; @@ -338,8 +339,8 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana * @return Exchange futures. */ @SuppressWarnings( {"unchecked", "RedundantCast"}) - public List<IgniteFuture<?>> exchangeFutures() { - return (List<IgniteFuture<?>>)(List)exchFuts.values(); + public List<IgniteInternalFuture<?>> exchangeFutures() { + return (List<IgniteInternalFuture<?>>)(List)exchFuts.values(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/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 a29f681..eee1267 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 @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*; import org.jetbrains.annotations.*; @@ -100,12 +101,12 @@ public interface GridCachePreloader<K, V> { /** * @return Future which will complete when preloader is safe to use. */ - public IgniteFuture<Object> startFuture(); + public IgniteInternalFuture<Object> startFuture(); /** * @return Future which will complete when preloading is finished. */ - public IgniteFuture<?> syncFuture(); + public IgniteInternalFuture<?> syncFuture(); /** * Requests that preloader sends the request for the key. @@ -114,7 +115,7 @@ public interface GridCachePreloader<K, V> { * @param topVer Topology version, {@code -1} if not required. * @return Future to complete when all keys are preloaded. */ - public IgniteFuture<Object> request(Collection<? extends K> keys, long topVer); + public IgniteInternalFuture<Object> request(Collection<? extends K> keys, long topVer); /** * Force preload process. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/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 8128b3b..64efa5a 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 @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*; import org.apache.ignite.internal.util.future.*; @@ -40,7 +41,7 @@ public class GridCachePreloaderAdapter<K, V> implements GridCachePreloader<K, V> protected final CacheAffinityFunction aff; /** Start future (always completed by default). */ - private final IgniteFuture finFut; + private final IgniteInternalFuture finFut; /** Preload predicate. */ protected IgnitePredicate<GridCacheEntryInfo<K, V>> preloadPred; @@ -95,12 +96,12 @@ public class GridCachePreloaderAdapter<K, V> implements GridCachePreloader<K, V> } /** {@inheritDoc} */ - @Override public IgniteFuture<Object> startFuture() { + @Override public IgniteInternalFuture<Object> startFuture() { return finFut; } /** {@inheritDoc} */ - @Override public IgniteFuture<?> syncFuture() { + @Override public IgniteInternalFuture<?> syncFuture() { return finFut; } @@ -110,7 +111,7 @@ public class GridCachePreloaderAdapter<K, V> implements GridCachePreloader<K, V> } /** {@inheritDoc} */ - @Override public IgniteFuture<Object> request(Collection<? extends K> keys, long topVer) { + @Override public IgniteInternalFuture<Object> request(Collection<? extends K> keys, long topVer) { return new GridFinishedFuture<>(cctx.kernalContext()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/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 e38f39a..b25c8b5 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 @@ -31,7 +31,6 @@ import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.util.*; -import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.LifecycleAware; import org.apache.ignite.spi.*; import org.apache.ignite.internal.processors.cache.datastructures.*; @@ -89,7 +88,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { private final Map<String, GridCache<?, ?>> publicProxies; /** Map of preload finish futures grouped by preload order. */ - private final NavigableMap<Integer, IgniteFuture<?>> preloadFuts; + private final NavigableMap<Integer, IgniteInternalFuture<?>> preloadFuts; /** Maximum detected preload order. */ private int maxPreloadOrder; @@ -1336,7 +1335,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { } } - for (IgniteFuture<?> fut : preloadFuts.values()) + for (IgniteInternalFuture<?> fut : preloadFuts.values()) ((GridCompoundFuture<Object, Object>)fut).markInitialized(); for (GridCacheSharedManager<?, ?> mgr : sharedCtx.managers()) @@ -1475,8 +1474,8 @@ public class GridCacheProcessor extends GridProcessorAdapter { * @param order Cache order. * @return Compound preload future or {@code null} if order is minimal order found. */ - @Nullable public IgniteFuture<?> orderedPreloadFuture(int order) { - Map.Entry<Integer, IgniteFuture<?>> entry = preloadFuts.lowerEntry(order); + @Nullable public IgniteInternalFuture<?> orderedPreloadFuture(int order) { + Map.Entry<Integer, IgniteInternalFuture<?>> entry = preloadFuts.lowerEntry(order); return entry == null ? null : entry.getValue(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java index 0ebb255..25e3cbb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; @@ -74,7 +75,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @param filter Optional filter. * @return Put operation future. */ - public IgniteFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, + public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter); /** @@ -101,7 +102,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @param filter Optional filter. * @return Putx operation future. */ - public IgniteFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, + public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter); /** @@ -121,7 +122,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @throws IgniteCheckedException If put operation failed. * @throws CacheFlagException If projection flags validation failed. */ - public IgniteFuture<?> putAllDrAsync(Map<? extends K, GridCacheDrInfo<V>> drMap) throws IgniteCheckedException; + public IgniteInternalFuture<?> putAllDrAsync(Map<? extends K, GridCacheDrInfo<V>> drMap) throws IgniteCheckedException; /** * Internal method that is called from {@link GridCacheEntryImpl}. @@ -143,7 +144,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @param filter Optional filter. * @return Put operation future. */ - public IgniteFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, + public IgniteInternalFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter); /** @@ -163,7 +164,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @throws IgniteCheckedException If remove failed. * @throws CacheFlagException If projection flags validation failed. */ - public IgniteFuture<?> removeAllDrAsync(Map<? extends K, GridCacheVersion> drMap) throws IgniteCheckedException; + public IgniteInternalFuture<?> removeAllDrAsync(Map<? extends K, GridCacheVersion> drMap) throws IgniteCheckedException; /** * Internal method that is called from {@link GridCacheEntryImpl}. @@ -185,7 +186,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @param filter Optional filter. * @return Putx operation future. */ - public IgniteFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, + public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter); /** @@ -211,7 +212,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @throws NullPointerException If either key or value are {@code null}. * @throws CacheFlagException If projection flags validation failed. */ - public IgniteFuture<GridCacheReturn<V>> replacexAsync(K key, V oldVal, V newVal); + public IgniteInternalFuture<GridCacheReturn<V>> replacexAsync(K key, V oldVal, V newVal); /** * Stores given key-value pair in cache only if only if the previous value is equal to the @@ -281,7 +282,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @throws NullPointerException if the key or value is {@code null}. * @throws CacheFlagException If projection flags validation failed. */ - public IgniteFuture<GridCacheReturn<V>> removexAsync(K key, V val); + public IgniteInternalFuture<GridCacheReturn<V>> removexAsync(K key, V val); /** * @param key Key to retrieve the value for. @@ -309,7 +310,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @param key Key to get value for. * @return Future with result. */ - public IgniteFuture<V> getForcePrimaryAsync(K key); + public IgniteInternalFuture<V> getForcePrimaryAsync(K key); /** * Gets values from cache. Will bypass started transaction, if any, i.e. will not enlist entries @@ -328,7 +329,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @param keys Keys to get values for. * @return Future with result. */ - public IgniteFuture<Map<K, V>> getAllOutTxAsync(List<K> keys); + public IgniteInternalFuture<Map<K, V>> getAllOutTxAsync(List<K> keys); /** * Checks whether this cache is GGFS data cache. @@ -409,7 +410,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @param args Arguments. * @return Future. */ - public <T> IgniteFuture<EntryProcessorResult<T>> invokeAsync(K key, + public <T> IgniteInternalFuture<EntryProcessorResult<T>> invokeAsync(K key, EntryProcessor<K, V, T> entryProcessor, Object... args); @@ -430,7 +431,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @param args Arguments. * @return Future. */ - public <T> IgniteFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync(Set<? extends K> keys, + public <T> IgniteInternalFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync(Set<? extends K> keys, EntryProcessor<K, V, T> entryProcessor, Object... args); @@ -449,7 +450,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @param args Arguments. * @return Future. */ - public <T> IgniteFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync( + public <T> IgniteInternalFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync( Map<? extends K, ? extends EntryProcessor<K, V, T>> map, Object... args); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java index 212c5bf..72b2505 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java @@ -21,6 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.cluster.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.lang.*; @@ -614,7 +615,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> containsKeyAsync(K key) { + @Override public IgniteInternalFuture<Boolean> containsKeyAsync(K key) { return cache.containsKeyAsync(key, entryFilter(false)); } @@ -639,7 +640,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<V> reloadAsync(K key) { + @Override public IgniteInternalFuture<V> reloadAsync(K key) { return cache.reloadAsync(key, entryFilter(false)); } @@ -649,7 +650,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<?> reloadAllAsync() { + @Override public IgniteInternalFuture<?> reloadAllAsync() { return cache.reloadAllAsync(entryFilter(false)); } @@ -659,7 +660,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<?> reloadAllAsync(@Nullable Collection<? extends K> keys) { + @Override public IgniteInternalFuture<?> reloadAllAsync(@Nullable Collection<? extends K> keys) { return cache.reloadAllAsync(keys, entryFilter(false)); } @@ -675,7 +676,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<V> getAsync(K key) { + @Override public IgniteInternalFuture<V> getAsync(K key) { return cache.getAsync(key, deserializePortables(), entryFilter(false)); } @@ -685,7 +686,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<V> getForcePrimaryAsync(K key) { + @Override public IgniteInternalFuture<V> getForcePrimaryAsync(K key) { return cache.getForcePrimaryAsync(key); } @@ -695,7 +696,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<Map<K, V>> getAllOutTxAsync(List<K> keys) { + @Override public IgniteInternalFuture<Map<K, V>> getAllOutTxAsync(List<K> keys) { return cache.getAllOutTxAsync(keys); } @@ -730,7 +731,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<Map<K, V>> getAllAsync(@Nullable Collection<? extends K> keys) { + @Override public IgniteInternalFuture<Map<K, V>> getAllAsync(@Nullable Collection<? extends K> keys) { return cache.getAllAsync(keys, deserializePortables(), entryFilter(false)); } @@ -747,13 +748,13 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<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) { return putAsync(key, val, null, -1, filter); } /** {@inheritDoc} */ - @Override public IgniteFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, + @Override public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { A.notNull(key, "key", val, "val"); @@ -782,7 +783,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<?> putAllDrAsync(Map<? extends K, GridCacheDrInfo<V>> drMap) + @Override public IgniteInternalFuture<?> putAllDrAsync(Map<? extends K, GridCacheDrInfo<V>> drMap) throws IgniteCheckedException { return cache.putAllDrAsync(drMap); } @@ -801,14 +802,14 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public <T> IgniteFuture<EntryProcessorResult<T>> invokeAsync(K key, + @Override public <T> IgniteInternalFuture<EntryProcessorResult<T>> invokeAsync(K key, EntryProcessor<K, V, T> entryProcessor, Object... args) { return cache.invokeAsync(key, entryProcessor, args); } /** {@inheritDoc} */ - @Override public <T> IgniteFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync(Set<? extends K> keys, + @Override public <T> IgniteInternalFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync(Set<? extends K> keys, EntryProcessor<K, V, T> entryProcessor, Object... args) { return cache.invokeAllAsync(keys, entryProcessor, args); @@ -822,20 +823,20 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public <T> IgniteFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync( + @Override public <T> IgniteInternalFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync( Map<? extends K, ? extends EntryProcessor<K, V, T>> map, Object... args) { return cache.invokeAllAsync(map, args); } /** {@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) { return putxAsync(key, val, null, -1, filter); } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, + @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { A.notNull(key, "key", val, "val"); @@ -852,7 +853,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<V> putIfAbsentAsync(K key, V val) { + @Override public IgniteInternalFuture<V> putIfAbsentAsync(K key, V val) { return putAsync(key, val, cctx.noPeekArray()); } @@ -862,7 +863,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> putxIfAbsentAsync(K key, V val) { + @Override public IgniteInternalFuture<Boolean> putxIfAbsentAsync(K key, V val) { return putxAsync(key, val, cctx.noPeekArray()); } @@ -872,7 +873,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<V> replaceAsync(K key, V val) { + @Override public IgniteInternalFuture<V> replaceAsync(K key, V val) { return putAsync(key, val, cctx.hasPeekArray()); } @@ -882,7 +883,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> replacexAsync(K key, V val) { + @Override public IgniteInternalFuture<Boolean> replacexAsync(K key, V val) { return putxAsync(key, val, cctx.hasPeekArray()); } @@ -892,7 +893,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> replaceAsync(K key, V oldVal, V newVal) { + @Override public IgniteInternalFuture<Boolean> replaceAsync(K key, V oldVal, V newVal) { IgnitePredicate<CacheEntry<K, V>> fltr = and(F.<K, V>cacheContainsPeek(oldVal), false); return cache.putxAsync(key, newVal, fltr); @@ -905,7 +906,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<?> putAllAsync(Map<? extends K, ? extends V> m, + @Override public IgniteInternalFuture<?> putAllAsync(Map<? extends K, ? extends V> m, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { m = isAll(m, true); @@ -1072,12 +1073,12 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<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) { return removeAsync(key, null, filter); } /** {@inheritDoc} */ - @Override public IgniteFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, + @Override public IgniteInternalFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return cache.removeAsync(key, entry, and(filter, false)); } @@ -1094,7 +1095,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<?> removeAllDrAsync(Map<? extends K, GridCacheVersion> drMap) throws IgniteCheckedException { + @Override public IgniteInternalFuture<?> removeAllDrAsync(Map<? extends K, GridCacheVersion> drMap) throws IgniteCheckedException { return cache.removeAllDrAsync(drMap); } @@ -1105,19 +1106,19 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> removexAsync(K key, + @Override public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { return removexAsync(key, null, filter); } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, + @Override public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return cache.removexAsync(key, entry, and(filter, false)); } /** {@inheritDoc} */ - @Override public IgniteFuture<GridCacheReturn<V>> replacexAsync(K key, V oldVal, V newVal) { + @Override public IgniteInternalFuture<GridCacheReturn<V>> replacexAsync(K key, V oldVal, V newVal) { A.notNull(key, "key", oldVal, "oldVal", newVal, "newVal"); // Check k-v predicate first. @@ -1138,7 +1139,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<GridCacheReturn<V>> removexAsync(K key, V val) { + @Override public IgniteInternalFuture<GridCacheReturn<V>> removexAsync(K key, V val) { return !isAll(key, val, true) ? new GridFinishedFuture<>(cctx.kernalContext(), new GridCacheReturn<V>(false)) : cache.removexAsync(key, val); } @@ -1149,7 +1150,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> removeAsync(K key, V val) { + @Override public IgniteInternalFuture<Boolean> removeAsync(K key, V val) { return !isAll(key, val, true) ? new GridFinishedFuture<>(cctx.kernalContext(), false) : cache.removeAsync(key, val); } @@ -1161,7 +1162,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<?> removeAllAsync(@Nullable Collection<? extends K> keys, + @Override public IgniteInternalFuture<?> removeAllAsync(@Nullable Collection<? extends K> keys, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { return cache.removeAllAsync(keys, and(filter, false)); } @@ -1173,7 +1174,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<?> removeAllAsync(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public IgniteInternalFuture<?> removeAllAsync(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return cache.removeAllAsync(and(filter, false)); } @@ -1184,7 +1185,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<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) { return cache.lockAsync(key, timeout, and(filter, false)); } @@ -1196,7 +1197,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> lockAllAsync(@Nullable Collection<? extends K> keys, long timeout, + @Override public IgniteInternalFuture<Boolean> lockAllAsync(@Nullable Collection<? extends K> keys, long timeout, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { return cache.lockAllAsync(keys, timeout, and(filter, false)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java index 5d78aac..a5b73dc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java @@ -23,6 +23,7 @@ import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cache.datastructures.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.cluster.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.lang.*; import org.apache.ignite.mxbean.*; @@ -245,7 +246,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<?> loadCacheAsync(IgniteBiPredicate<K, V> p, long ttl, @Nullable Object[] args) { + @Override public IgniteInternalFuture<?> loadCacheAsync(IgniteBiPredicate<K, V> p, long ttl, @Nullable Object[] args) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -354,7 +355,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> containsKeyAsync(K key) { + @Override public IgniteInternalFuture<Boolean> containsKeyAsync(K key) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -415,7 +416,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<V> reloadAsync(K key) { + @Override public IgniteInternalFuture<V> reloadAsync(K key) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -439,7 +440,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<?> reloadAllAsync() { + @Override public IgniteInternalFuture<?> reloadAllAsync() { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -463,7 +464,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<?> reloadAllAsync(@Nullable Collection<? extends K> keys) { + @Override public IgniteInternalFuture<?> reloadAllAsync(@Nullable Collection<? extends K> keys) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -500,7 +501,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<V> getAsync(K key) { + @Override public IgniteInternalFuture<V> getAsync(K key) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -524,7 +525,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<V> getForcePrimaryAsync(K key) { + @Override public IgniteInternalFuture<V> getForcePrimaryAsync(K key) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -548,7 +549,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<Map<K, V>> getAllOutTxAsync(List<K> keys) { + @Override public IgniteInternalFuture<Map<K, V>> getAllOutTxAsync(List<K> keys) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -632,7 +633,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<Map<K, V>> getAllAsync(@Nullable Collection<? extends K> keys) { + @Override public IgniteInternalFuture<Map<K, V>> getAllAsync(@Nullable Collection<? extends K> keys) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -670,7 +671,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@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) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -683,7 +684,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, + @Override public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -734,7 +735,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<?> putAllDrAsync(Map<? extends K, GridCacheDrInfo<V>> drMap) + @Override public IgniteInternalFuture<?> putAllDrAsync(Map<? extends K, GridCacheDrInfo<V>> drMap) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -761,7 +762,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public <T> IgniteFuture<EntryProcessorResult<T>> invokeAsync(K key, + @Override public <T> IgniteInternalFuture<EntryProcessorResult<T>> invokeAsync(K key, EntryProcessor<K, V, T> entryProcessor, Object... args) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -789,7 +790,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public <T> IgniteFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync( + @Override public <T> IgniteInternalFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync( Set<? extends K> keys, EntryProcessor<K, V, T> entryProcessor, Object... args) { @@ -818,7 +819,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public <T> IgniteFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync( + @Override public <T> IgniteInternalFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync( Map<? extends K, ? extends EntryProcessor<K, V, T>> map, Object... args) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -832,7 +833,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@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) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -845,7 +846,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> putxAsync(K key, + @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, @@ -873,7 +874,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<V> putIfAbsentAsync(K key, V val) { + @Override public IgniteInternalFuture<V> putIfAbsentAsync(K key, V val) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -897,7 +898,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> putxIfAbsentAsync(K key, V val) { + @Override public IgniteInternalFuture<Boolean> putxIfAbsentAsync(K key, V val) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -921,7 +922,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<V> replaceAsync(K key, V val) { + @Override public IgniteInternalFuture<V> replaceAsync(K key, V val) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -945,7 +946,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> replacexAsync(K key, V val) { + @Override public IgniteInternalFuture<Boolean> replacexAsync(K key, V val) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -969,7 +970,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> replaceAsync(K key, V oldVal, V newVal) { + @Override public IgniteInternalFuture<Boolean> replaceAsync(K key, V oldVal, V newVal) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -994,7 +995,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<?> putAllAsync(@Nullable Map<? extends K, ? extends V> m, + @Override public IgniteInternalFuture<?> putAllAsync(@Nullable Map<? extends K, ? extends V> m, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1362,7 +1363,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@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) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1374,7 +1375,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, + @Override public IgniteInternalFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1412,7 +1413,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<?> removeAllDrAsync(Map<? extends K, GridCacheVersion> drMap) throws IgniteCheckedException { + @Override public IgniteInternalFuture<?> removeAllDrAsync(Map<? extends K, GridCacheVersion> drMap) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1437,7 +1438,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> removexAsync(K key, + @Override public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1450,7 +1451,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, + @Override public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1463,7 +1464,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<GridCacheReturn<V>> replacexAsync(K key, V oldVal, V newVal) { + @Override public IgniteInternalFuture<GridCacheReturn<V>> replacexAsync(K key, V oldVal, V newVal) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1499,7 +1500,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<GridCacheReturn<V>> removexAsync(K key, V val) { + @Override public IgniteInternalFuture<GridCacheReturn<V>> removexAsync(K key, V val) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1523,7 +1524,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> removeAsync(K key, V val) { + @Override public IgniteInternalFuture<Boolean> removeAsync(K key, V val) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1548,7 +1549,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<?> removeAllAsync(@Nullable Collection<? extends K> keys, + @Override public IgniteInternalFuture<?> removeAllAsync(@Nullable Collection<? extends K> keys, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1574,7 +1575,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<?> removeAllAsync(@Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Override public IgniteInternalFuture<?> removeAllAsync(@Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1599,7 +1600,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@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) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1625,7 +1626,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> lockAllAsync(@Nullable Collection<? extends K> keys, long timeout, + @Override public IgniteInternalFuture<Boolean> lockAllAsync(@Nullable Collection<? extends K> keys, long timeout, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1855,7 +1856,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteFuture<?> forceRepartition() { + @Override public IgniteInternalFuture<?> forceRepartition() { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java index 34d8ee0..956c503 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java @@ -22,7 +22,6 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.version.*; -import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.transactions.*; import org.apache.ignite.internal.managers.communication.*; @@ -74,7 +73,7 @@ public class GridCacheSharedContext<K, V> { private volatile IgniteTxMetricsAdapter txMetrics; /** Preloaders start future. */ - private IgniteFuture<Object> preloadersStartFut; + private IgniteInternalFuture<Object> preloadersStartFut; /** * @param txMgr Transaction manager. @@ -196,12 +195,12 @@ public class GridCacheSharedContext<K, V> { /** * @return Compound preloaders start future. */ - public IgniteFuture<Object> preloadersStartFuture() { + public IgniteInternalFuture<Object> preloadersStartFuture() { if (preloadersStartFut == null) { GridCompoundFuture<Object, Object> compound = null; for (GridCacheContext<K, V> cacheCtx : cacheContexts()) { - IgniteFuture<Object> startFut = cacheCtx.preloader().startFuture(); + IgniteInternalFuture<Object> startFut = cacheCtx.preloader().startFuture(); if (!startFut.isDone()) { if (compound == null) @@ -382,7 +381,7 @@ public class GridCacheSharedContext<K, V> { * @return {@code true} if waiting was successful. */ @SuppressWarnings({"unchecked"}) - public IgniteFuture<?> partitionReleaseFuture(long topVer) { + public IgniteInternalFuture<?> partitionReleaseFuture(long topVer) { GridCompoundFuture f = new GridCompoundFuture(kernalCtx); f.add(mvcc().finishExplicitLocks(topVer)); @@ -462,7 +461,7 @@ public class GridCacheSharedContext<K, V> { * @param tx Transaction to commit. * @return Commit future. */ - public IgniteFuture<IgniteTx> commitTxAsync(IgniteTxEx<K, V> tx) { + public IgniteInternalFuture<IgniteTx> commitTxAsync(IgniteTxEx<K, V> tx) { Collection<Integer> cacheIds = tx.activeCacheIds(); if (cacheIds.isEmpty()) @@ -484,7 +483,7 @@ public class GridCacheSharedContext<K, V> { * @param tx Transaction to rollback. * @throws IgniteCheckedException If failed. */ - public IgniteFuture rollbackTxAsync(IgniteTxEx<K, V> tx) throws IgniteCheckedException { + public IgniteInternalFuture rollbackTxAsync(IgniteTxEx<K, V> tx) throws IgniteCheckedException { Collection<Integer> cacheIds = tx.activeCacheIds(); if (!cacheIds.isEmpty()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index 28cc285..7cbcd85 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@ -22,6 +22,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.distributed.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.util.*; @@ -1060,10 +1061,10 @@ public class GridCacheUtils { * @param excl Excludes. * @return Future listener that logs errors. */ - public static IgniteInClosure<IgniteFuture<?>> errorLogger(final IgniteLogger log, + public static IgniteInClosure<IgniteInternalFuture<?>> errorLogger(final IgniteLogger log, final Class<? extends Exception>... excl) { - return new CI1<IgniteFuture<?>>() { - @Override public void apply(IgniteFuture<?> f) { + return new CI1<IgniteInternalFuture<?>>() { + @Override public void apply(IgniteInternalFuture<?> f) { try { f.get(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index cca29b7..743e5b9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.mxbean.*; import org.apache.ignite.internal.util.tostring.*; @@ -458,11 +459,11 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter<IgniteCach GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { - IgniteFuture<?> fut = ctx.cache().loadAll(keys, replaceExisting); + IgniteInternalFuture<?> fut = ctx.cache().loadAll(keys, replaceExisting); if (completionLsnr != null) { - fut.listenAsync(new CI1<IgniteFuture<?>>() { - @Override public void apply(IgniteFuture<?> fut) { + fut.listenAsync(new CI1<IgniteInternalFuture<?>>() { + @Override public void apply(IgniteInternalFuture<?> fut) { try { fut.get(); @@ -786,10 +787,10 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter<IgniteCach try { if (isAsync()) { - IgniteFuture<EntryProcessorResult<T>> fut = delegate.invokeAsync(key, entryProcessor, args); + IgniteInternalFuture<EntryProcessorResult<T>> fut = delegate.invokeAsync(key, entryProcessor, args); - IgniteFuture<T> fut0 = fut.chain(new CX1<IgniteFuture<EntryProcessorResult<T>>, T>() { - @Override public T applyx(IgniteFuture<EntryProcessorResult<T>> fut) + IgniteInternalFuture<T> fut0 = fut.chain(new CX1<IgniteInternalFuture<EntryProcessorResult<T>>, T>() { + @Override public T applyx(IgniteInternalFuture<EntryProcessorResult<T>> fut) throws IgniteCheckedException { EntryProcessorResult<T> 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/datastructures/GridCacheAtomicSequenceImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java index 67499a7..628d696 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.datastructures; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.datastructures.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; @@ -263,7 +264,7 @@ public final class GridCacheAtomicSequenceImpl implements GridCacheAtomicSequenc * @throws IgniteCheckedException If update failed. */ @SuppressWarnings("SignalWithoutCorrespondingAwait") - private IgniteFuture<Long> internalUpdateAsync(long l, @Nullable Callable<Long> updateCall, boolean updated) + private IgniteInternalFuture<Long> internalUpdateAsync(long l, @Nullable Callable<Long> updateCall, boolean updated) throws IgniteCheckedException { checkRemoved(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java index 19629ae..dbfbb2c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.*; import org.apache.ignite.cluster.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.util.*; @@ -219,7 +220,7 @@ public class GridCacheOptimisticCheckPreparedTxFuture<K, V> extends GridCompound */ public void onResult(UUID nodeId, GridCacheOptimisticCheckPreparedTxResponse<K, V> res) { if (!isDone()) { - for (IgniteFuture<Boolean> fut : pending()) { + for (IgniteInternalFuture<Boolean> fut : pending()) { if (isMini(fut)) { MiniFuture f = (MiniFuture)fut; @@ -252,7 +253,7 @@ public class GridCacheOptimisticCheckPreparedTxFuture<K, V> extends GridCompound /** {@inheritDoc} */ @Override public boolean onNodeLeft(UUID nodeId) { - for (IgniteFuture<?> fut : futures()) + for (IgniteInternalFuture<?> fut : futures()) if (isMini(fut)) { MiniFuture f = (MiniFuture)fut; @@ -302,7 +303,7 @@ public class GridCacheOptimisticCheckPreparedTxFuture<K, V> extends GridCompound * @param f Future. * @return {@code True} if mini-future. */ - private boolean isMini(IgniteFuture<?> f) { + private boolean isMini(IgniteInternalFuture<?> f) { return f.getClass().equals(MiniFuture.class); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.java index 818477d..2afa7a4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.*; import org.apache.ignite.cluster.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.util.*; @@ -169,7 +170,7 @@ public class GridCachePessimisticCheckCommittedTxFuture<K, V> extends GridCompou */ public void onResult(UUID nodeId, GridCachePessimisticCheckCommittedTxResponse<K, V> res) { if (!isDone()) { - for (IgniteFuture<GridCacheCommittedTxInfo<K, V>> fut : pending()) { + for (IgniteInternalFuture<GridCacheCommittedTxInfo<K, V>> fut : pending()) { if (isMini(fut)) { MiniFuture f = (MiniFuture)fut; @@ -202,7 +203,7 @@ public class GridCachePessimisticCheckCommittedTxFuture<K, V> extends GridCompou /** {@inheritDoc} */ @Override public boolean onNodeLeft(UUID nodeId) { - for (IgniteFuture<?> fut : futures()) + for (IgniteInternalFuture<?> fut : futures()) if (isMini(fut)) { MiniFuture f = (MiniFuture)fut; @@ -258,7 +259,7 @@ public class GridCachePessimisticCheckCommittedTxFuture<K, V> extends GridCompou * @param f Future. * @return {@code True} if mini-future. */ - private boolean isMini(IgniteFuture<?> f) { + private boolean isMini(IgniteInternalFuture<?> f) { return f.getClass().equals(MiniFuture.class); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java index 9023c5d..3441d69 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java @@ -18,8 +18,8 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.future.*; import org.jdk8.backport.*; @@ -71,7 +71,7 @@ public class GridCacheTxFinishSync<K, V> { * @param threadId Thread ID to wait ack. * @return {@code null} if ack was received or future that will be completed when ack is received. */ - public IgniteFuture<?> awaitAckAsync(UUID nodeId, long threadId) { + public IgniteInternalFuture<?> awaitAckAsync(UUID nodeId, long threadId) { ThreadFinishSync threadSync = threadMap.get(threadId); if (threadSync == null) @@ -150,7 +150,7 @@ public class GridCacheTxFinishSync<K, V> { * @param nodeId Node ID to wait ack from. * @return {@code null} if ack has been received or future that will be completed when ack is received. */ - public IgniteFuture<?> awaitAckAsync(UUID nodeId) { + public IgniteInternalFuture<?> awaitAckAsync(UUID nodeId) { TxFinishSync sync = nodeMap.get(nodeId); if (sync == null) @@ -233,7 +233,7 @@ public class GridCacheTxFinishSync<K, V> { * * @return {@code null} if ack has been received, or future that will be completed when ack is received. */ - @Nullable public IgniteFuture<?> awaitAckAsync() { + @Nullable public IgniteInternalFuture<?> awaitAckAsync() { synchronized (this) { if (cnt == 0) return null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java index 0a33a4c..52eea01 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.cache.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.lang.*; @@ -60,7 +61,7 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> txLockAsync( + @Override public IgniteInternalFuture<Boolean> txLockAsync( Collection<? extends K> keys, long timeout, IgniteTxLocalEx<K, V> tx, @@ -77,7 +78,7 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> lockAllAsync(Collection<? extends K> keys, long timeout, + @Override public IgniteInternalFuture<Boolean> lockAllAsync(Collection<? extends K> keys, long timeout, IgnitePredicate<CacheEntry<K, V>>... filter) { IgniteTxLocalEx<K, V> tx = ctx.tm().userTxx(); @@ -97,7 +98,7 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter * @param filter Optional filter. * @return Future for locks. */ - protected abstract IgniteFuture<Boolean> lockAllAsync(Collection<? extends K> keys, + protected abstract IgniteInternalFuture<Boolean> lockAllAsync(Collection<? extends K> keys, long timeout, @Nullable IgniteTxLocalEx<K, V> tx, boolean isInvalidate, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java index f7376cf..c417e9d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.lang.*; @@ -359,7 +360,7 @@ public class GridDistributedTxRemoteAdapter<K, V> extends IgniteTxAdapter<K, V> } /** {@inheritDoc} */ - @Override public IgniteFuture<IgniteTxEx<K, V>> prepareAsync() { + @Override public IgniteInternalFuture<IgniteTxEx<K, V>> prepareAsync() { assert false; return null; } @@ -717,7 +718,7 @@ public class GridDistributedTxRemoteAdapter<K, V> extends IgniteTxAdapter<K, V> } /** {@inheritDoc} */ - @Override public IgniteFuture<IgniteTx> commitAsync() { + @Override public IgniteInternalFuture<IgniteTx> commitAsync() { try { commit(); @@ -748,7 +749,7 @@ public class GridDistributedTxRemoteAdapter<K, V> extends IgniteTxAdapter<K, V> } /** {@inheritDoc} */ - @Override public IgniteFuture<IgniteTx> rollbackAsync() { + @Override public IgniteInternalFuture<IgniteTx> rollbackAsync() { rollback(); return new GridFinishedFutureEx<IgniteTx>(this);
