http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheMockEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheMockEntry.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheMockEntry.java index 171573b..1e68763 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheMockEntry.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheMockEntry.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.eviction; 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.future.*; import org.apache.ignite.internal.util.lang.*; @@ -164,7 +165,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<V> setAsync(V val, + @Nullable @Override public IgniteInternalFuture<V> setAsync(V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { // No-op. return null; @@ -177,7 +178,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<V> setIfAbsentAsync(V val) { + @Nullable @Override public IgniteInternalFuture<V> setIfAbsentAsync(V val) { // No-op. return null; } @@ -190,7 +191,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<Boolean> setxAsync(V val, + @Nullable @Override public IgniteInternalFuture<Boolean> setxAsync(V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { // No-op. return null; @@ -203,7 +204,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<Boolean> setxIfAbsentAsync(V val) { + @Nullable @Override public IgniteInternalFuture<Boolean> setxIfAbsentAsync(V val) { // No-op. return null; } @@ -215,7 +216,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<V> replaceAsync(V val) { + @Nullable @Override public IgniteInternalFuture<V> replaceAsync(V val) { // No-op. return null; } @@ -227,7 +228,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<Boolean> replacexAsync(V val) { + @Nullable @Override public IgniteInternalFuture<Boolean> replacexAsync(V val) { // No-op. return null; } @@ -239,7 +240,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<Boolean> replaceAsync(V oldVal, V newVal) { + @Nullable @Override public IgniteInternalFuture<Boolean> replaceAsync(V oldVal, V newVal) { // No-op. return null; } @@ -252,7 +253,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<V> removeAsync( + @Nullable @Override public IgniteInternalFuture<V> removeAsync( @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { // No-op. return null; @@ -265,7 +266,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<Boolean> removexAsync( + @Nullable @Override public IgniteInternalFuture<Boolean> removexAsync( @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { // No-op. return null; @@ -278,7 +279,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<Boolean> removeAsync(V val) { + @Nullable @Override public IgniteInternalFuture<Boolean> removeAsync(V val) { // No-op. return null; } @@ -295,7 +296,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> lockAsync(long timeout, + @Override public IgniteInternalFuture<Boolean> lockAsync(long timeout, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return new GridFinishedFuture<>(null, false); } @@ -326,7 +327,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Override public IgniteFuture<V> reloadAsync() { + @Override public IgniteInternalFuture<V> reloadAsync() { return new GridFinishedFuture<>(); } @@ -336,7 +337,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Override public IgniteFuture<V> getAsync() { + @Override public IgniteInternalFuture<V> getAsync() { return new GridFinishedFuture<>(); }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java index b4f53dd..a90e7c0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java @@ -22,8 +22,8 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.cluster.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.*; @@ -81,7 +81,7 @@ public class GridCacheSynchronousEvictionsFailoverSelfTest extends GridCacheAbst final AtomicBoolean stop = new AtomicBoolean(); - IgniteFuture<?> fut = null; + IgniteInternalFuture<?> fut = null; try { Map<String, Integer> data = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java index 964fdc9..f5e8e26 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java @@ -21,6 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.resources.*; @@ -189,7 +190,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { * @return Future object. * @throws IgniteCheckedException If failed. */ - private IgniteFuture<?> runAsync(int idx, Runnable job, @Nullable IgnitePredicate<ClusterNode> p) + private IgniteInternalFuture<?> runAsync(int idx, Runnable job, @Nullable IgnitePredicate<ClusterNode> p) throws IgniteCheckedException { assert idx >= 0 && idx < NODES_CNT; assert job != null; @@ -212,7 +213,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { * @return Future object. * @throws IgniteCheckedException If failed. */ - private IgniteFuture<?> broadcast(int idx, Runnable job, @Nullable IgnitePredicate<ClusterNode> p) + private IgniteInternalFuture<?> broadcast(int idx, Runnable job, @Nullable IgnitePredicate<ClusterNode> p) throws IgniteCheckedException { assert idx >= 0 && idx < NODES_CNT; assert job != null; @@ -238,7 +239,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { * @return Future object. * @throws IgniteCheckedException If failed. */ - private IgniteFuture<?> runAsync(int idx, Collection<TestRunnable> jobs, @Nullable IgnitePredicate<ClusterNode> p) + private IgniteInternalFuture<?> runAsync(int idx, Collection<TestRunnable> jobs, @Nullable IgnitePredicate<ClusterNode> p) throws IgniteCheckedException { assert idx >= 0 && idx < NODES_CNT; assert !F.isEmpty(jobs); @@ -261,7 +262,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { * @return Future object. * @throws IgniteCheckedException If failed. */ - private IgniteFuture<Integer> callAsync(int idx, Callable<Integer> job, @Nullable IgnitePredicate<ClusterNode> p) + private IgniteInternalFuture<Integer> callAsync(int idx, Callable<Integer> job, @Nullable IgnitePredicate<ClusterNode> p) throws IgniteCheckedException { assert idx >= 0 && idx < NODES_CNT; assert job != null; @@ -284,7 +285,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { * @return Future object. * @throws IgniteCheckedException If failed. */ - private IgniteFuture<Collection<Integer>> broadcast(int idx, Callable<Integer> job, + private IgniteInternalFuture<Collection<Integer>> broadcast(int idx, Callable<Integer> job, @Nullable IgnitePredicate<ClusterNode> p) throws IgniteCheckedException { assert idx >= 0 && idx < NODES_CNT; assert job != null; @@ -307,7 +308,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { * @return Future object. * @throws IgniteCheckedException If failed. */ - private IgniteFuture<Collection<Integer>> callAsync(int idx, Collection<TestCallable> jobs, + private IgniteInternalFuture<Collection<Integer>> callAsync(int idx, Collection<TestCallable> jobs, @Nullable IgnitePredicate<ClusterNode> p) throws IgniteCheckedException { assert idx >= 0 && idx < NODES_CNT; assert !F.isEmpty(jobs); @@ -341,7 +342,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { public void testRunAsyncSingle() throws Exception { Runnable job = new TestRunnable(); - IgniteFuture<?> fut = broadcast(0, job, null); + IgniteInternalFuture<?> fut = broadcast(0, job, null); assert fut.get() == null; @@ -367,7 +368,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { public void testRunAsyncMultiple() throws Exception { Collection<TestRunnable> jobs = F.asList(new TestRunnable(), new TestRunnable()); - IgniteFuture<?> fut = runAsync(0, jobs, null); + IgniteInternalFuture<?> fut = runAsync(0, jobs, null); assert fut.get() == null : "Execution result must be null."; @@ -381,7 +382,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { public void testCallAsyncSingle() throws Exception { Callable<Integer> job = new TestCallable(); - IgniteFuture<Collection<Integer>> fut1 = broadcast(0, job, null); + IgniteInternalFuture<Collection<Integer>> fut1 = broadcast(0, job, null); assert fut1.get() != null; @@ -394,7 +395,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { assertEquals(1, execCntr.get()); - IgniteFuture<Integer> fut2 = callAsync(0, job, null); + IgniteInternalFuture<Integer> fut2 = callAsync(0, job, null); assert fut2.get() == 1 : "Execution result must be equal to 1, actual: " + fut2.get(); @@ -411,7 +412,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { comp.withNoFailover().call(new TestCallableError()); - IgniteFuture<Integer> fut = comp.future(); + IgniteInternalFuture<Integer> fut = comp.future(); try { fut.get(); @@ -467,7 +468,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { public void testCallAsyncMultiple() throws Exception { Collection<TestCallable> jobs = F.asList(new TestCallable(), new TestCallable()); - IgniteFuture<Collection<Integer>> fut = callAsync(0, jobs, null); + IgniteInternalFuture<Collection<Integer>> fut = callAsync(0, jobs, null); Collection<Integer> results = fut.get(); @@ -490,7 +491,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { comp.call(jobs, F.sumIntReducer()); - IgniteFuture<Integer> fut = comp.future(); + IgniteInternalFuture<Integer> fut = comp.future(); // Sum of arithmetic progression. int exp = (1 + jobs.size()) * jobs.size() / 2; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java index a67d1cd..8109f5e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java @@ -958,7 +958,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { final Random rnd = new Random(); - IgniteFuture<?> starterFut = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> starterFut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { for (int i = 0; i < CONSUME_CNT; i++) { int idx = rnd.nextInt(GRID_CNT); @@ -991,7 +991,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { } }, 8, "consume-starter"); - IgniteFuture<?> stopperFut = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> stopperFut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { while (!stop.get()) { IgniteBiTuple<Integer, UUID> t = queue.poll(1, SECONDS); @@ -1020,7 +1020,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { } }, 4, "consume-stopper"); - IgniteFuture<?> nodeRestarterFut = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> nodeRestarterFut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { while (!stop.get()) { startGrid("anotherGrid"); @@ -1031,7 +1031,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { } }, 1, "node-restarter"); - IgniteFuture<?> jobRunnerFut = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> jobRunnerFut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { while (!stop.get()) { int idx = rnd.nextInt(GRID_CNT); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java index 6910310..e0af999 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java @@ -24,6 +24,7 @@ import org.apache.ignite.cache.eviction.fifo.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -208,9 +209,9 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { final CountDownLatch l1 = new CountDownLatch(threads); - IgniteFuture<?> f1 = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> f1 = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { - Collection<IgniteFuture<?>> futs = new ArrayList<>(cnt); + Collection<IgniteInternalFuture<?>> futs = new ArrayList<>(cnt); for (int i = 0; i < cnt; i++) { int idx = idxGen.getAndIncrement(); @@ -220,7 +221,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { l1.countDown(); - for (IgniteFuture<?> fut : futs) + for (IgniteInternalFuture<?> fut : futs) fut.get(); return null; @@ -247,9 +248,9 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { final CountDownLatch l2 = new CountDownLatch(threads); - IgniteFuture<?> f2 = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> f2 = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { - Collection<IgniteFuture<?>> futs = new ArrayList<>(cnt); + Collection<IgniteInternalFuture<?>> futs = new ArrayList<>(cnt); for (int i = 0; i < cnt; i++) { final int key = idxGen.decrementAndGet(); @@ -259,7 +260,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { l2.countDown(); - for (IgniteFuture<?> fut : futs) + for (IgniteInternalFuture<?> fut : futs) fut.get(); return null; @@ -391,9 +392,9 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { try { final int totalPutCnt = 50000; - IgniteFuture<?> fut1 = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> fut1 = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { - Collection<IgniteFuture<?>> futs = new ArrayList<>(); + Collection<IgniteInternalFuture<?>> futs = new ArrayList<>(); while (!done.get()) { int idx = idxGen.getAndIncrement(); @@ -409,14 +410,14 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { ldr.flush(); - for (IgniteFuture<?> fut : futs) + for (IgniteInternalFuture<?> fut : futs) fut.get(); return null; } }, 5, "producer"); - IgniteFuture<?> fut2 = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> fut2 = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { while (!done.get()) { ldr.flush(); @@ -431,7 +432,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { // Define index of node being restarted. final int restartNodeIdx = nodesCntCache + nodesCntNoCache + 1; - IgniteFuture<?> fut3 = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> fut3 = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { try { for (int i = 0; i < 5; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java index d6b7583..8fa33d2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java @@ -1121,7 +1121,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes int threadCnt = 5; - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Runnable() { @Override public void run() { while (!stop.get()) { IgniteFsOutputStream os = null; @@ -1440,7 +1440,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes int threadCnt = 5; - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Runnable() { @Override public void run() { while (!stop.get()) { IgniteFsOutputStream os = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java index 0ec979d..92d18ab 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java @@ -21,6 +21,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.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -166,7 +167,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { rnd.nextBytes(data); - IgniteFuture<Boolean> fut = mgr.writeStart(info); + IgniteInternalFuture<Boolean> fut = mgr.writeStart(info); expectsStoreFail(info, data, "Not enough space reserved to store data"); @@ -253,7 +254,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { info = new GridGgfsFileInfo(info, info.length() + data.length + remainder.length); - IgniteFuture<Boolean> fut = mgr.writeStart(info); + IgniteInternalFuture<Boolean> fut = mgr.writeStart(info); GridGgfsFileAffinityRange range = new GridGgfsFileAffinityRange(); @@ -338,7 +339,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { info = new GridGgfsFileInfo(info, info.length() + data.length * writesCnt); - IgniteFuture<Boolean> fut = mgr.writeStart(info); + IgniteInternalFuture<Boolean> fut = mgr.writeStart(info); for (int j = 0; j < 64; j++) { Arrays.fill(data, (byte)(j / 4)); @@ -375,7 +376,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { pos += stored.length; } - IgniteFuture<Object> delFut = mgr.delete(info); + IgniteInternalFuture<Object> delFut = mgr.delete(info); delFut.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsTaskSelfTest.java index 1211797..d003d9b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsTaskSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsTaskSelfTest.java @@ -24,6 +24,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; import org.apache.ignite.fs.mapreduce.*; import org.apache.ignite.fs.mapreduce.records.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -185,7 +186,7 @@ public class GridGgfsTaskSelfTest extends GridGgfsCommonAbstractTest { assertNull(ggfsAsync.execute( new Task(), new IgniteFsStringDelimiterRecordResolver(" "), Collections.singleton(FILE), arg)); - IgniteFuture<IgniteBiTuple<Long, Integer>> fut = ggfsAsync.future(); + IgniteInternalFuture<IgniteBiTuple<Long, Integer>> fut = ggfsAsync.future(); assertNotNull(fut); @@ -197,7 +198,7 @@ public class GridGgfsTaskSelfTest extends GridGgfsCommonAbstractTest { ggfsAsync.format(); - IgniteFuture<?> fut = ggfsAsync.future(); + IgniteInternalFuture<?> fut = ggfsAsync.future(); assertNotNull(fut); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java index b6836e8..dd2f623 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java @@ -22,7 +22,6 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.internal.processors.rest.*; @@ -242,7 +241,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { new InvocationHandler() { @Override public Object invoke(Object proxy, Method mtd, Object[] args) throws Throwable { if (failMtd.equals(mtd.getName())) { - IgniteFuture<Object> fut = new GridFinishedFuture<>(ctx, + IgniteInternalFuture<Object> fut = new GridFinishedFuture<>(ctx, new IgniteCheckedException("Operation failed")); fut.syncNotify(sync); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java index a0469b3..c36edff 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.managed.*; import org.apache.ignite.resources.*; import org.apache.ignite.internal.processors.affinity.*; @@ -146,11 +146,11 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs svcs1.deployClusterSingleton(name, new DummyService()); - IgniteFuture<?> fut1 = svcs1.future(); + IgniteInternalFuture<?> fut1 = svcs1.future(); svcs2.deployClusterSingleton(name, new DummyService()); - IgniteFuture<?> fut2 = svcs2.future(); + IgniteInternalFuture<?> fut2 = svcs2.future(); info("Deployed service: " + name); @@ -175,11 +175,11 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs svcs1.deployClusterSingleton(name, new DummyService()); - IgniteFuture<?> fut1 = svcs1.future(); + IgniteInternalFuture<?> fut1 = svcs1.future(); svcs2.deployNodeSingleton(name, new DummyService()); - IgniteFuture<?> fut2 = svcs2.future(); + IgniteInternalFuture<?> fut2 = svcs2.future(); info("Deployed service: " + name); @@ -259,7 +259,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs svcs.deployNodeSingleton(name, new DummyService()); - IgniteFuture<?> fut = svcs.future(); + IgniteInternalFuture<?> fut = svcs.future(); info("Deployed service: " + name); @@ -291,7 +291,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs svcs.deployClusterSingleton(name, new DummyService()); - IgniteFuture<?> fut = svcs.future(); + IgniteInternalFuture<?> fut = svcs.future(); info("Deployed service: " + name); @@ -325,7 +325,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs svcs.deployKeyAffinitySingleton(name, new AffinityService(affKey), CACHE_NAME, affKey); - IgniteFuture<?> fut = svcs.future(); + IgniteInternalFuture<?> fut = svcs.future(); info("Deployed service: " + name); @@ -352,7 +352,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs svcs.deployMultiple(name, new DummyService(), nodeCount() * 2, 3); - IgniteFuture<?> fut = svcs.future(); + IgniteInternalFuture<?> fut = svcs.future(); info("Deployed service: " + name); @@ -386,7 +386,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs svcs.deployMultiple(name, new DummyService(), cnt, 3); - IgniteFuture<?> fut = svcs.future(); + IgniteInternalFuture<?> fut = svcs.future(); info("Deployed service: " + name); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java index fccbf85..355aea4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.service; import junit.framework.*; import org.apache.ignite.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import java.util.concurrent.*; @@ -48,7 +48,7 @@ public class GridServiceProcessorMultiNodeSelfTest extends GridServiceProcessorA svcs.deployClusterSingleton(name, new DummyService()); - IgniteFuture<?> fut = svcs.future(); + IgniteInternalFuture<?> fut = svcs.future(); info("Deployed service: " + name); @@ -96,7 +96,7 @@ public class GridServiceProcessorMultiNodeSelfTest extends GridServiceProcessorA svcs.deployKeyAffinitySingleton(name, new AffinityService(affKey), CACHE_NAME, affKey); - IgniteFuture<?> fut = svcs.future(); + IgniteInternalFuture<?> fut = svcs.future(); info("Deployed service: " + name); @@ -134,7 +134,7 @@ public class GridServiceProcessorMultiNodeSelfTest extends GridServiceProcessorA svcs.deployNodeSingleton(name, new DummyService()); - IgniteFuture<?> fut = svcs.future(); + IgniteInternalFuture<?> fut = svcs.future(); info("Deployed service: " + name); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerFailoverSelfTest.java index e28f927..90fbe20 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerFailoverSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.streamer; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.streamer.*; import org.apache.ignite.streamer.window.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -139,7 +139,7 @@ public class GridStreamerFailoverSelfTest extends GridCommonAbstractTest { final AtomicBoolean done = new AtomicBoolean(false); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/timeout/GridTimeoutProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/timeout/GridTimeoutProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/timeout/GridTimeoutProcessorSelfTest.java index b9cfbc5..aafe93c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/timeout/GridTimeoutProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/timeout/GridTimeoutProcessorSelfTest.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.timeout; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.*; @@ -382,7 +383,7 @@ public class GridTimeoutProcessorSelfTest extends GridCommonAbstractTest { public void testAddRemoveInterleaving() throws Exception { final AtomicInteger callCnt = new AtomicInteger(0); - IgniteFuture<?> rmv = GridTestUtils.runMultiThreadedAsync(new Runnable() { + IgniteInternalFuture<?> rmv = GridTestUtils.runMultiThreadedAsync(new Runnable() { /** {@inheritDoc} */ @SuppressWarnings("CallToThreadYield") @Override public void run() { @@ -440,7 +441,7 @@ public class GridTimeoutProcessorSelfTest extends GridCommonAbstractTest { final CountDownLatch latch = new CountDownLatch(max * threads); - IgniteFuture<?> called = GridTestUtils.runMultiThreadedAsync(new Runnable() { + IgniteInternalFuture<?> called = GridTestUtils.runMultiThreadedAsync(new Runnable() { /** {@inheritDoc} */ @SuppressWarnings("CallToThreadYield") @Override public void run() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridCompoundFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridCompoundFutureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridCompoundFutureSelfTest.java index d31cf82..550e8ee 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridCompoundFutureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridCompoundFutureSelfTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.util.future; import org.apache.ignite.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.junits.*; import org.apache.ignite.testframework.junits.common.*; @@ -39,7 +39,7 @@ public class GridCompoundFutureSelfTest extends GridCommonAbstractTest { GridCompoundFuture<Boolean, Boolean> fut = new GridCompoundFuture<>(); for (int i = 0; i < 5; i++) { - IgniteFuture<Boolean> part = new GridFinishedFuture<>(ctx, true); + IgniteInternalFuture<Boolean> part = new GridFinishedFuture<>(ctx, true); part.syncNotify(true); @@ -143,7 +143,7 @@ public class GridCompoundFutureSelfTest extends GridCommonAbstractTest { fut.markInitialized(); - IgniteFuture<?> complete = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> complete = multithreadedAsync(new Runnable() { @Override public void run() { GridFutureAdapter<Boolean> part; @@ -178,7 +178,7 @@ public class GridCompoundFutureSelfTest extends GridCommonAbstractTest { fut.markInitialized(); - IgniteFuture<?> complete = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> complete = multithreadedAsync(new Runnable() { @Override public void run() { GridFutureAdapter<Boolean> part; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridEmbeddedFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridEmbeddedFutureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridEmbeddedFutureSelfTest.java index d94a4e0..62d5c1a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridEmbeddedFutureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridEmbeddedFutureSelfTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.util.future; import org.apache.ignite.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.testframework.junits.*; @@ -48,12 +49,12 @@ public class GridEmbeddedFutureSelfTest extends GridCommonAbstractTest { public void testFutureChain() throws Exception { GridFutureAdapter<Integer> fut = new GridFutureAdapter<>(ctx); - IgniteFuture<Integer> cur = fut; + IgniteInternalFuture<Integer> cur = fut; for (int i = 0; i < DFLT_MAX_CONCURRENT_ASYNC_OPS; i++) { cur = new GridEmbeddedFuture<>(cur, - new IgniteBiClosure<Integer, Exception, IgniteFuture<Integer>>() { - @Override public IgniteFuture<Integer> apply(Integer o, Exception e) { + new IgniteBiClosure<Integer, Exception, IgniteInternalFuture<Integer>>() { + @Override public IgniteInternalFuture<Integer> apply(Integer o, Exception e) { return new GridFinishedFuture<>(ctx, o); } }, ctx); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java index 3a15be5..43a8cf0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.util.future; import org.apache.ignite.*; import org.apache.ignite.internal.*; -import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.internal.util.typedef.*; @@ -69,7 +68,7 @@ public class GridFinishedFutureSelfTest extends GridCommonAbstractTest { IgniteMarshaller m = new IgniteOptimizedMarshaller(); ClassLoader clsLdr = getClass().getClassLoader(); - IgniteFuture<Object> orig = t == null ? new GridFinishedFuture<>(ctx, ex) : + IgniteInternalFuture<Object> orig = t == null ? new GridFinishedFuture<>(ctx, ex) : new GridFinishedFuture<>(ctx, t); orig.syncNotify(syncNotify); @@ -90,8 +89,8 @@ public class GridFinishedFutureSelfTest extends GridCommonAbstractTest { final CountDownLatch done = new CountDownLatch(1); - fut.listenAsync(new CI1<IgniteFuture<Object>>() { - @Override public void apply(IgniteFuture<Object> t) { + fut.listenAsync(new CI1<IgniteInternalFuture<Object>>() { + @Override public void apply(IgniteInternalFuture<Object> t) { done.countDown(); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java index 393a054..9acdb19 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.util.future; import org.apache.ignite.*; import org.apache.ignite.cluster.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.internal.processors.closure.*; import org.apache.ignite.internal.util.io.*; @@ -126,8 +127,8 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest { final AtomicReference<Exception> err = new AtomicReference<>(); for (int i = 0; i < lsnrCnt; i++) { - fut.listenAsync(new CI1<IgniteFuture<String>>() { - @Override public void apply(IgniteFuture<String> t) { + fut.listenAsync(new CI1<IgniteInternalFuture<String>>() { + @Override public void apply(IgniteInternalFuture<String> t) { if (Thread.currentThread() != runThread) err.compareAndSet(null, new Exception("Wrong notification thread: " + Thread.currentThread())); @@ -147,8 +148,8 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest { err.set(null); - fut.listenAsync(new CI1<IgniteFuture<String>>() { - @Override public void apply(IgniteFuture<String> t) { + fut.listenAsync(new CI1<IgniteInternalFuture<String>>() { + @Override public void apply(IgniteInternalFuture<String> t) { if (Thread.currentThread() != runThread) err.compareAndSet(null, new Exception("Wrong notification thread: " + Thread.currentThread())); @@ -187,8 +188,8 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest { final AtomicReference<Exception> err = new AtomicReference<>(); for (int i = 0; i < lsnrCnt; i++) { - fut.listenAsync(new CI1<IgniteFuture<String>>() { - @Override public void apply(IgniteFuture<String> t) { + fut.listenAsync(new CI1<IgniteInternalFuture<String>>() { + @Override public void apply(IgniteInternalFuture<String> t) { if (Thread.currentThread() == runThread) err.compareAndSet(null, new Exception("Wrong notification thread: " + Thread.currentThread())); @@ -209,8 +210,8 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest { err.set(null); - fut.listenAsync(new CI1<IgniteFuture<String>>() { - @Override public void apply(IgniteFuture<String> t) { + fut.listenAsync(new CI1<IgniteInternalFuture<String>>() { + @Override public void apply(IgniteInternalFuture<String> t) { if (Thread.currentThread() == runThread) err.compareAndSet(null, new Exception("Wrong notification thread: " + Thread.currentThread())); @@ -235,8 +236,8 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest { */ @SuppressWarnings("ErrorNotRethrown") public void testChaining() throws Exception { - final CX1<IgniteFuture<Object>, Object> passThrough = new CX1<IgniteFuture<Object>, Object>() { - @Override public Object applyx(IgniteFuture<Object> f) throws IgniteCheckedException { + final CX1<IgniteInternalFuture<Object>, Object> passThrough = new CX1<IgniteInternalFuture<Object>, Object>() { + @Override public Object applyx(IgniteInternalFuture<Object> f) throws IgniteCheckedException { return f.get(); } }; @@ -254,7 +255,7 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest { // Test result returned. GridFutureAdapter<Object> fut = new GridFutureAdapter<>(ctx); - IgniteFuture<Object> chain = fut.chain(passThrough); + IgniteInternalFuture<Object> chain = fut.chain(passThrough); assertFalse(fut.isDone()); assertFalse(chain.isDone()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureListenPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureListenPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureListenPerformanceTest.java index 39fc283..f87e12d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureListenPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureListenPerformanceTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.util.future; import org.apache.ignite.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.jdk8.backport.*; @@ -74,8 +75,8 @@ public class GridFutureListenPerformanceTest { futs.add(fut); for (int k = 1; k < rnd.nextInt(3); k++) { - fut.listenAsync(new IgniteInClosure<IgniteFuture<Object>>() { - @Override public void apply(IgniteFuture<Object> t) { + fut.listenAsync(new IgniteInClosure<IgniteInternalFuture<Object>>() { + @Override public void apply(IgniteInternalFuture<Object> t) { try { t.get(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemorySpaceSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemorySpaceSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemorySpaceSelfTest.java index fac8c9b..6d08898 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemorySpaceSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/GridIpcSharedMemorySpaceSelfTest.java @@ -18,8 +18,8 @@ package org.apache.ignite.internal.util.ipc.shmem; import org.apache.ignite.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.lang.*; import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.common.*; import org.jdk8.backport.*; @@ -68,7 +68,7 @@ public class GridIpcSharedMemorySpaceSelfTest extends GridCommonAbstractTest { final AtomicReference<GridIpcSharedMemorySpace> spaceRef = new AtomicReference<>(); - IgniteFuture<?> fut1 = multithreadedAsync( + IgniteInternalFuture<?> fut1 = multithreadedAsync( new Callable<Object>() { @SuppressWarnings("TooBroadScope") @Override public Object call() throws Exception { @@ -99,7 +99,7 @@ public class GridIpcSharedMemorySpaceSelfTest extends GridCommonAbstractTest { 1, "writer"); - IgniteFuture<?> fut2 = multithreadedAsync( + IgniteInternalFuture<?> fut2 = multithreadedAsync( new Callable<Object>() { @SuppressWarnings({"TooBroadScope", "StatementWithEmptyBody"}) @Override public Object call() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java index f5f061a..83729fc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java @@ -18,8 +18,8 @@ package org.apache.ignite.internal.util.nio; import org.apache.ignite.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.*; -import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -102,7 +102,7 @@ public class GridNioSelfTest extends GridCommonAbstractTest { GridNioServer<?> srvr = startServer(PORT, new GridPlainParser(), lsnr); try { - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Runnable() { @Override public void run() { byte[] msg = new byte[MSG_SIZE]; @@ -256,7 +256,7 @@ public class GridNioSelfTest extends GridCommonAbstractTest { final AtomicBoolean running = new AtomicBoolean(true); try { - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Runnable() { @Override public void run() { try { @@ -628,7 +628,7 @@ public class GridNioSelfTest extends GridCommonAbstractTest { new EchoListener()); try { - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Runnable() { @SuppressWarnings("BusyWait") @Override public void run() { try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapAbstractSelfTest.java index 2fc7db0..f271512 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapAbstractSelfTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.util.offheap; import org.apache.ignite.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.offheap.unsafe.*; @@ -662,7 +663,7 @@ public abstract class GridOffHeapMapAbstractSelfTest extends GridCommonAbstractT final AtomicBoolean run = new AtomicBoolean(true); - IgniteFuture<?> itFut = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> itFut = multithreadedAsync(new Runnable() { @Override public void run() { try { startLatch.await(); @@ -687,7 +688,7 @@ public abstract class GridOffHeapMapAbstractSelfTest extends GridCommonAbstractT } }, 1); - IgniteFuture<?> putFut = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> putFut = multithreadedAsync(new Runnable() { @Override public void run() { try { startLatch.await(); @@ -746,7 +747,7 @@ public abstract class GridOffHeapMapAbstractSelfTest extends GridCommonAbstractT keys[i][0] = (byte)i; // hash } - IgniteFuture<?> fut = multithreadedAsync(new Callable<Void>() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Void>() { @Override public Void call() throws IgniteCheckedException { Random rnd = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java index c7c81c4..61bcae0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.util.offheap; import org.apache.ignite.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cache.affinity.consistenthash.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.testframework.junits.common.*; @@ -595,7 +596,7 @@ public abstract class GridOffHeapPartitionedMapAbstractSelfTest extends GridComm final AtomicBoolean running = new AtomicBoolean(true); - IgniteFuture<?> iterFut = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> iterFut = multithreadedAsync(new Runnable() { @Override public void run() { try { while (running.get()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java index f8c469e..1f1f806 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.util.offheap; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cache.affinity.consistenthash.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.junits.common.*; @@ -167,7 +167,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); @@ -222,7 +222,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); @@ -293,7 +293,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); @@ -348,7 +348,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemorySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemorySelfTest.java index 1f23c9b..9048eb4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemorySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/unsafe/GridUnsafeMemorySelfTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.util.offheap.unsafe; import org.apache.ignite.internal.util.*; -import org.apache.ignite.lang.IgniteFuture; +import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.testframework.junits.common.*; import org.jdk8.backport.*; @@ -264,7 +264,7 @@ public class GridUnsafeMemorySelfTest extends GridCommonAbstractTest { final AtomicBoolean run = new AtomicBoolean(true); - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Runnable() { @Override public void run() { int x = 0; @@ -317,7 +317,7 @@ public class GridUnsafeMemorySelfTest extends GridCommonAbstractTest { final LongAdder locAdder = new LongAdder(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new GridRandom(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/jvmtest/ConcurrentMapTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/jvmtest/ConcurrentMapTest.java b/modules/core/src/test/java/org/apache/ignite/jvmtest/ConcurrentMapTest.java index 368dd72..aec32f5 100644 --- a/modules/core/src/test/java/org/apache/ignite/jvmtest/ConcurrentMapTest.java +++ b/modules/core/src/test/java/org/apache/ignite/jvmtest/ConcurrentMapTest.java @@ -17,8 +17,8 @@ package org.apache.ignite.jvmtest; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.*; -import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.testframework.*; @@ -84,7 +84,7 @@ public class ConcurrentMapTest { final AtomicInteger writes = new AtomicInteger(); - IgniteFuture fut1 = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture fut1 = GridTestUtils.runMultiThreadedAsync( new Runnable() { @Override public void run() { while (!done.get()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/jvmtest/NetworkFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/jvmtest/NetworkFailureTest.java b/modules/core/src/test/java/org/apache/ignite/jvmtest/NetworkFailureTest.java index 8aa9081..5a8b1da 100644 --- a/modules/core/src/test/java/org/apache/ignite/jvmtest/NetworkFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/jvmtest/NetworkFailureTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.jvmtest; import junit.framework.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.*; @@ -42,7 +42,7 @@ public class NetworkFailureTest extends TestCase { final InetAddress addr = InetAddress.getByName("192.168.0.100"); - IgniteFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { ServerSocket srvSock = null; @@ -80,7 +80,7 @@ public class NetworkFailureTest extends TestCase { "server" ); - IgniteFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { Socket sock = null; @@ -141,7 +141,7 @@ public class NetworkFailureTest extends TestCase { public void testReadTimeout() throws Exception { final InetAddress addr = InetAddress.getByName("192.168.3.10"); - IgniteFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { ServerSocket srvSock = null; @@ -182,7 +182,7 @@ public class NetworkFailureTest extends TestCase { "server" ); - IgniteFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { Socket sock = null; @@ -225,7 +225,7 @@ public class NetworkFailureTest extends TestCase { final InetAddress addr = InetAddress.getByName("192.168.0.100"); - IgniteFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { ServerSocket srvSock = null; @@ -253,7 +253,7 @@ public class NetworkFailureTest extends TestCase { final AtomicReference<Socket> sockRef = new AtomicReference<>(); - IgniteFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { Socket sock = null; @@ -287,7 +287,7 @@ public class NetworkFailureTest extends TestCase { "client" ); - IgniteFuture<?> fut3 = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture<?> fut3 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { while (true) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/jvmtest/QueueSizeCounterMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/jvmtest/QueueSizeCounterMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/jvmtest/QueueSizeCounterMultiThreadedTest.java index ecbcdb5..edade0a 100644 --- a/modules/core/src/test/java/org/apache/ignite/jvmtest/QueueSizeCounterMultiThreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/jvmtest/QueueSizeCounterMultiThreadedTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.jvmtest; import junit.framework.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.testframework.*; import org.jetbrains.annotations.*; @@ -46,7 +46,7 @@ public class QueueSizeCounterMultiThreadedTest extends TestCase { final ReadWriteLock lock = new ReentrantReadWriteLock(); - IgniteFuture fut1 = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture fut1 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @SuppressWarnings( {"BusyWait"}) @Nullable @Override public Object call() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/jvmtest/ReadWriteLockMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/jvmtest/ReadWriteLockMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/jvmtest/ReadWriteLockMultiThreadedTest.java index 416f040..b484c97 100644 --- a/modules/core/src/test/java/org/apache/ignite/jvmtest/ReadWriteLockMultiThreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/jvmtest/ReadWriteLockMultiThreadedTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.jvmtest; import junit.framework.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.testframework.*; import org.jetbrains.annotations.*; @@ -62,7 +62,7 @@ public class ReadWriteLockMultiThreadedTest extends TestCase { X.println("Read lock acquired."); - IgniteFuture fut1 = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture fut1 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { X.println("Attempting to acquire write lock: " + lock); @@ -85,7 +85,7 @@ public class ReadWriteLockMultiThreadedTest extends TestCase { Thread.sleep(2000); - IgniteFuture fut2 = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture fut2 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { X.println("Attempting to acquire read lock: " + lock); @@ -131,7 +131,7 @@ public class ReadWriteLockMultiThreadedTest extends TestCase { X.println("Write lock acquired: " + lock); - IgniteFuture fut = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture fut = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { X.println("Attempting to acquire read lock: " + lock); @@ -176,7 +176,7 @@ public class ReadWriteLockMultiThreadedTest extends TestCase { X.println("Read lock acquired."); - IgniteFuture fut = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture fut = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { boolean res = lock.writeLock().tryLock(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/lang/GridBasicPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/lang/GridBasicPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/lang/GridBasicPerformanceTest.java index 688eebf..3e2fa19 100644 --- a/modules/core/src/test/java/org/apache/ignite/lang/GridBasicPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/lang/GridBasicPerformanceTest.java @@ -17,6 +17,7 @@ package org.apache.ignite.lang; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.future.*; import org.apache.ignite.internal.util.lang.*; @@ -821,7 +822,7 @@ public class GridBasicPerformanceTest { final CountDownLatch latch1 = new CountDownLatch(1); - IgniteFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { latch1.await(); @@ -854,7 +855,7 @@ public class GridBasicPerformanceTest { final CountDownLatch latch2 = new CountDownLatch(1); - IgniteFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @SuppressWarnings("StatementWithEmptyBody") @Nullable @Override public Object call() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java index fe3f031..7e9d618 100644 --- a/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java @@ -23,6 +23,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; +import org.apache.ignite.internal.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.internal.util.typedef.*; @@ -3187,7 +3188,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { new GridFutureAdapter<>(), new GridFutureAdapter<>(), new GridFutureAdapter<>() }; - for (IgniteFuture fut : futs) { + for (IgniteInternalFuture fut : futs) { assert !fut.isDone(); } @@ -3208,7 +3209,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { F.<Object>awaitAll(futs); - for (IgniteFuture fut : futs) { + for (IgniteInternalFuture fut : futs) { assert fut.isDone(); } } @@ -3220,7 +3221,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { public void testAwaitOne() throws Exception { final GridFutureAdapter<?>[] futs = {new GridFutureAdapter(), new GridFutureAdapter(), new GridFutureAdapter()}; - for (IgniteFuture fut : futs) { + for (IgniteInternalFuture fut : futs) { assert !fut.isDone(); } @@ -3237,16 +3238,16 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { } }.start(); - IgniteFuture doneFut = F.awaitOne((IgniteFuture[])futs); + IgniteInternalFuture doneFut = F.awaitOne((IgniteInternalFuture[])futs); assert doneFut.isDone(); - for (IgniteFuture fut : futs) { + for (IgniteInternalFuture fut : futs) { assert doneFut == fut ? fut.isDone() : !fut.isDone(); } // Check only NULLs. - IgniteFuture<Object> fut = F.awaitOne(Arrays.asList((IgniteFuture<Object>)null, null, null)); + IgniteInternalFuture<Object> fut = F.awaitOne(Arrays.asList((IgniteInternalFuture<Object>)null, null, null)); assert fut.isDone(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/lang/GridFutureListenPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/lang/GridFutureListenPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/lang/GridFutureListenPerformanceTest.java index 6929be8..a139c4f 100644 --- a/modules/core/src/test/java/org/apache/ignite/lang/GridFutureListenPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/lang/GridFutureListenPerformanceTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.lang; import org.apache.ignite.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.future.*; import org.jdk8.backport.*; @@ -74,8 +75,8 @@ public class GridFutureListenPerformanceTest { futs.add(fut); for (int k = 1; k < rnd.nextInt(3); k++) { - fut.listenAsync(new IgniteInClosure<IgniteFuture<Object>>() { - @Override public void apply(IgniteFuture<Object> t) { + fut.listenAsync(new IgniteInClosure<IgniteInternalFuture<Object>>() { + @Override public void apply(IgniteInternalFuture<Object> t) { try { t.get(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java index 51f243f..e7412c3 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtest/swapspace/GridFileSwapSpaceSpiMultithreadedLoadTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.loadtest.swapspace; import org.apache.ignite.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.spi.*; import org.apache.ignite.spi.swapspace.*; import org.apache.ignite.spi.swapspace.file.*; @@ -147,7 +147,7 @@ public class GridFileSwapSpaceSpiMultithreadedLoadTest extends GridCommonAbstrac } }); - IgniteFuture<?> evictFut = GridTestUtils.runMultiThreadedAsync(new Runnable() { + IgniteInternalFuture<?> evictFut = GridTestUtils.runMultiThreadedAsync(new Runnable() { @Override public void run() { try { ThreadLocalRandom8 rnd = ThreadLocalRandom8.current(); @@ -209,7 +209,7 @@ public class GridFileSwapSpaceSpiMultithreadedLoadTest extends GridCommonAbstrac } }); - IgniteFuture<?> unswapFut = GridTestUtils.runMultiThreadedAsync(new Runnable() { + IgniteInternalFuture<?> unswapFut = GridTestUtils.runMultiThreadedAsync(new Runnable() { @Override public void run() { try { ThreadLocalRandom8 rnd = ThreadLocalRandom8.current(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java index f6b5904..077beed 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.loadtests.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.transactions.*; import org.apache.log4j.*; import org.apache.log4j.varia.*; @@ -136,7 +136,7 @@ abstract class GridCacheAbstractLoadTest { assert cache != null; try { - IgniteFuture<?> f1 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> f1 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { @Nullable @Override public Object call() throws Exception { long start = System.currentTimeMillis(); @@ -158,7 +158,7 @@ abstract class GridCacheAbstractLoadTest { } }, writeThreads(), "cache-load-test-worker"); - IgniteFuture<?> f2 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> f2 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { @Nullable @Override public Object call() throws Exception { long start = System.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java index 66e99f8..cb91263 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSwapLoadTest.java @@ -20,6 +20,7 @@ package org.apache.ignite.loadtests.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.events.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.testframework.*; @@ -123,7 +124,7 @@ public class GridCacheSwapLoadTest { } }, EVT_CACHE_OBJECT_SWAPPED); - Collection<IgniteFuture<?>> futs = new ArrayList<>(3); + Collection<IgniteInternalFuture<?>> futs = new ArrayList<>(3); long start = System.currentTimeMillis(); @@ -197,7 +198,7 @@ public class GridCacheSwapLoadTest { /** * @return Future. */ - private static IgniteFuture<?> doPut(final Ignite g) { + private static IgniteInternalFuture<?> doPut(final Ignite g) { final AtomicInteger putKey = new AtomicInteger(0); return GridTestUtils.runMultiThreadedAsync(new CAX() { @@ -226,7 +227,7 @@ public class GridCacheSwapLoadTest { /** * @return Futures. */ - private static Collection<IgniteFuture<Long>> doGetRemove(final Ignite g) { + private static Collection<IgniteInternalFuture<Long>> doGetRemove(final Ignite g) { final AtomicBoolean stop = new AtomicBoolean(false); return F.asList( @@ -300,9 +301,9 @@ public class GridCacheSwapLoadTest { /** * @param futs Futures. */ - private static void wait(Iterable<IgniteFuture<?>> futs) { - F.forEach(futs, new CIX1<IgniteFuture<?>>() { - @Override public void applyx(IgniteFuture<?> fut) throws IgniteCheckedException { + private static void wait(Iterable<IgniteInternalFuture<?>> futs) { + F.forEach(futs, new CIX1<IgniteInternalFuture<?>>() { + @Override public void applyx(IgniteInternalFuture<?> fut) throws IgniteCheckedException { fut.get(); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java index 213b634..e8b5a30 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cache.GridCache; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -157,7 +157,7 @@ public class GridCacheWriteBehindStoreLoadTest extends GridCommonAbstractTest { long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Runnable() { @SuppressWarnings({"NullableProblems"}) @Override public void run() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java index 0aed81d..5207af6 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestMain.java @@ -20,7 +20,7 @@ package org.apache.ignite.loadtests.colocation; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.thread.*; import org.apache.ignite.internal.util.typedef.*; import org.springframework.beans.factory.*; @@ -73,7 +73,7 @@ public class GridTestMain { final GridCache<GridTestKey, Long> cache = g.cache("partitioned"); - final BlockingQueue<IgniteFuture> q = new ArrayBlockingQueue<>(400); + final BlockingQueue<IgniteInternalFuture> q = new ArrayBlockingQueue<>(400); long start = System.currentTimeMillis(); @@ -93,12 +93,12 @@ public class GridTestMain { } }); - final IgniteFuture<?> f = comp.future(); + final IgniteInternalFuture<?> f = comp.future(); q.put(f); - f.listenAsync(new CI1<IgniteFuture<?>>() { - @Override public void apply(IgniteFuture<?> o) { + f.listenAsync(new CI1<IgniteInternalFuture<?>>() { + @Override public void apply(IgniteInternalFuture<?> o) { q.poll(); } });
