Repository: incubator-ignite Updated Branches: refs/heads/ignite-26-2 [created] 90948e67a
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java index 19436e2d..68dfb29 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java @@ -727,7 +727,7 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** {@inheritDoc} */ - @Override public IgniteFuture<?> awaitDeletesAsync() throws IgniteCheckedException { + @Override public InternalFuture<?> awaitDeletesAsync() throws IgniteCheckedException { return null; } @@ -914,7 +914,7 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** {@inheritDoc} */ - @Override public <R> IgniteFuture<R> future() { + @Override public <R> InternalFuture<R> future() { return null; } } @@ -994,7 +994,7 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> sendAdminEmailAsync(String subj, String body, boolean html) { + @Override public InternalFuture<Boolean> sendAdminEmailAsync(String subj, String body, boolean html) { return null; } @@ -1208,7 +1208,7 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** {@inheritDoc} */ - @Override public <R> IgniteFuture<R> future() { + @Override public <R> InternalFuture<R> future() { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopJobTrackerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopJobTrackerSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopJobTrackerSelfTest.java index b1cc968..5d8a1c5 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopJobTrackerSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopJobTrackerSelfTest.java @@ -217,7 +217,7 @@ public class GridHadoopJobTrackerSelfTest extends GridHadoopAbstractSelfTest { assert stat != null; - IgniteFuture<?> fut = hadoop.finishFuture(jobId); + InternalFuture<?> fut = hadoop.finishFuture(jobId); if (!complete) assertFalse(fut.isDone()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceEmbeddedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceEmbeddedSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceEmbeddedSelfTest.java index 02a2ea5..e869ce1 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceEmbeddedSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceEmbeddedSelfTest.java @@ -109,7 +109,7 @@ public class GridHadoopMapReduceEmbeddedSelfTest extends GridHadoopMapReduceTest job.setJarByClass(GridHadoopWordCount2.class); - IgniteFuture<?> fut = grid(0).hadoop().submit(new GridHadoopJobId(UUID.randomUUID(), 1), + InternalFuture<?> fut = grid(0).hadoop().submit(new GridHadoopJobId(UUID.randomUUID(), 1), createJobInfo(job.getConfiguration())); fut.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceTest.java index b92b432..88c52b0 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceTest.java @@ -18,7 +18,6 @@ import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.counter.*; import org.gridgain.grid.kernal.processors.hadoop.examples.*; @@ -89,7 +88,7 @@ public class GridHadoopMapReduceTest extends GridHadoopAbstractWordCountTest { GridHadoopJobId jobId = new GridHadoopJobId(UUID.randomUUID(), 1); - IgniteFuture<?> fut = grid(0).hadoop().submit(jobId, createJobInfo(job.getConfiguration())); + InternalFuture<?> fut = grid(0).hadoop().submit(jobId, createJobInfo(job.getConfiguration())); fut.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java index 4c8a139..a013d36 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java @@ -18,7 +18,6 @@ import org.apache.hadoop.mapreduce.lib.output.*; import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.ggfs.hadoop.v1.*; import org.gridgain.grid.hadoop.*; import org.gridgain.grid.util.lang.*; @@ -137,7 +136,7 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest job.setJarByClass(getClass()); - IgniteFuture<?> fut = grid(0).hadoop().submit(new GridHadoopJobId(UUID.randomUUID(), 1), + InternalFuture<?> fut = grid(0).hadoop().submit(new GridHadoopJobId(UUID.randomUUID(), 1), createJobInfo(job.getConfiguration())); fut.get(); @@ -183,7 +182,7 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest GridHadoopJobId jobId = new GridHadoopJobId(UUID.randomUUID(), 2); - IgniteFuture<?> fut = grid(0).hadoop().submit(jobId, createJobInfo(job.getConfiguration())); + InternalFuture<?> fut = grid(0).hadoop().submit(jobId, createJobInfo(job.getConfiguration())); fut.get(); @@ -220,7 +219,7 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest job.setJarByClass(getClass()); - final IgniteFuture<?> fut = grid(0).hadoop().submit(new GridHadoopJobId(UUID.randomUUID(), 3), + final InternalFuture<?> fut = grid(0).hadoop().submit(new GridHadoopJobId(UUID.randomUUID(), 3), createJobInfo(job.getConfiguration())); GridTestUtils.assertThrows(log, new Callable<Object>() { @@ -308,7 +307,7 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest GridHadoopJobId jobId = new GridHadoopJobId(UUID.randomUUID(), 1); - final IgniteFuture<?> fut = grid(0).hadoop().submit(jobId, createJobInfo(cfg)); + final InternalFuture<?> fut = grid(0).hadoop().submit(jobId, createJobInfo(cfg)); if (!GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { @@ -359,7 +358,7 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest assertFalse(killRes); - final IgniteFuture<?> fut = hadoop.submit(jobId, createJobInfo(cfg)); + final InternalFuture<?> fut = hadoop.submit(jobId, createJobInfo(cfg)); if (!GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorServiceTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorServiceTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorServiceTest.java index 1e5aefc..1035194 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorServiceTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorServiceTest.java @@ -1,6 +1,6 @@ package org.gridgain.grid.kernal.processors.hadoop.taskexecutor; -import org.apache.ignite.lang.IgniteFuture; +import org.apache.ignite.lang.InternalFuture; import org.gridgain.grid.util.typedef.X; import org.gridgain.testframework.junits.common.GridCommonAbstractTest; import org.jdk8.backport.LongAdder; @@ -66,7 +66,7 @@ public class GridHadoopExecutorServiceTest extends GridCommonAbstractTest { final AtomicBoolean finish = new AtomicBoolean(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { while (!finish.get()) { exec.submit(new Callable<Void>() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java index b8359f7..4a4ffa8 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java @@ -18,7 +18,6 @@ import org.apache.hadoop.mapreduce.lib.output.*; import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.*; import org.gridgain.grid.util.typedef.*; @@ -86,7 +85,7 @@ public class GridHadoopExternalTaskExecutionSelfTest extends GridHadoopAbstractS job.setJarByClass(getClass()); - IgniteFuture<?> fut = grid(0).hadoop().submit(new GridHadoopJobId(UUID.randomUUID(), 1), + InternalFuture<?> fut = grid(0).hadoop().submit(new GridHadoopJobId(UUID.randomUUID(), 1), createJobInfo(job.getConfiguration())); fut.get(); @@ -122,7 +121,7 @@ public class GridHadoopExternalTaskExecutionSelfTest extends GridHadoopAbstractS job.setJarByClass(getClass()); - IgniteFuture<?> fut = grid(0).hadoop().submit(new GridHadoopJobId(UUID.randomUUID(), 1), + InternalFuture<?> fut = grid(0).hadoop().submit(new GridHadoopJobId(UUID.randomUUID(), 1), createJobInfo(job.getConfiguration())); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/test/java/org/gridgain/loadtests/ggfs/GridGgfsPerformanceBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/loadtests/ggfs/GridGgfsPerformanceBenchmark.java b/modules/hadoop/src/test/java/org/gridgain/loadtests/ggfs/GridGgfsPerformanceBenchmark.java index d76bd45..2d591a0 100644 --- a/modules/hadoop/src/test/java/org/gridgain/loadtests/ggfs/GridGgfsPerformanceBenchmark.java +++ b/modules/hadoop/src/test/java/org/gridgain/loadtests/ggfs/GridGgfsPerformanceBenchmark.java @@ -78,7 +78,7 @@ public class GridGgfsPerformanceBenchmark { long start = System.currentTimeMillis(); - IgniteFuture<Long> fut = GridTestUtils.runMultiThreadedAsync(new Runnable() { + InternalFuture<Long> fut = GridTestUtils.runMultiThreadedAsync(new Runnable() { @Override public void run() { String fileIdx = op == OP_READ ? String.valueOf(idx.getAndIncrement()) : UUID.randomUUID().toString(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java index 407e112..0389738 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java @@ -504,7 +504,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { public void testIteratorsCleanup() throws Exception { final GridCache<Long, Long> cache = populate(); - IgniteFuture<?> offHeapFut = multithreadedAsync(new Runnable() { + InternalFuture<?> offHeapFut = multithreadedAsync(new Runnable() { @Override public void run() { try { Iterator<Map.Entry<Long, Long>> ohIt = cache.offHeapIterator(); @@ -527,7 +527,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { } }, 20); - IgniteFuture<?> swapFut = multithreadedAsync(new Runnable() { + InternalFuture<?> swapFut = multithreadedAsync(new Runnable() { @Override public void run() { try { Iterator<Map.Entry<Long, Long>> ohIt = cache.swapIterator(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java index 15d3b2a..f6ac616 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java @@ -17,7 +17,6 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.spi.swapspace.file.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.eviction.lru.*; import org.gridgain.grid.cache.query.*; @@ -252,7 +251,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final AtomicBoolean done = new AtomicBoolean(); - IgniteFuture<?> fut = multithreadedAsync(new CAX() { + InternalFuture<?> fut = multithreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { Random rnd = new Random(); @@ -332,7 +331,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final AtomicBoolean done = new AtomicBoolean(); - IgniteFuture<?> fut = multithreadedAsync(new CAX() { + InternalFuture<?> fut = multithreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { Random rnd = new Random(); @@ -416,7 +415,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final AtomicBoolean done = new AtomicBoolean(); - IgniteFuture<?> fut = multithreadedAsync(new CAX() { + InternalFuture<?> fut = multithreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { Random rnd = new Random(); @@ -497,7 +496,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final AtomicBoolean done = new AtomicBoolean(); - IgniteFuture<?> fut = multithreadedAsync(new CAX() { + InternalFuture<?> fut = multithreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { Random rnd = new Random(); @@ -577,7 +576,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final GridCacheQuery<Map.Entry<Integer, Integer>> qry = c.queries().createSqlQuery(Integer.class, "_val >= 0"); - IgniteFuture<?> fut = multithreadedAsync( + InternalFuture<?> fut = multithreadedAsync( new CAX() { @Override public void applyx() throws IgniteCheckedException { int iter = 0; @@ -641,7 +640,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final AtomicBoolean done = new AtomicBoolean(); - IgniteFuture<?> fut = multithreadedAsync(new CAX() { + InternalFuture<?> fut = multithreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { int iter = 0; @@ -723,7 +722,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final AtomicBoolean stop = new AtomicBoolean(); - IgniteFuture<?> fut = multithreadedAsync(new CAX() { + InternalFuture<?> fut = multithreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { while (!stop.get()) { Collection<Integer> rmtVals = rdcQry.execute(rmtRdc).get(); @@ -792,7 +791,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest final GridCacheQuery<Map.Entry<Integer, Integer>> qry = c.queries().createScanQuery(null); - IgniteFuture<?> fut = multithreadedAsync( + InternalFuture<?> fut = multithreadedAsync( new CAX() { @Override public void applyx() throws IgniteCheckedException { int iter = 0; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java index 430c4cb..57fe6ad 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java @@ -80,7 +80,7 @@ public class GridCacheReduceQueryMultithreadedSelfTest extends GridCacheAbstract final CountDownLatch startLatch = new CountDownLatch(1); - IgniteFuture<?> fut1 = multithreadedAsync(new Callable() { + InternalFuture<?> fut1 = multithreadedAsync(new Callable() { @Override public Object call() throws Exception { for (int i = 1; i < keyCnt; i++) { assertTrue(c.putx(String.valueOf(i), i)); @@ -118,7 +118,7 @@ public class GridCacheReduceQueryMultithreadedSelfTest extends GridCacheAbstract startLatch.await(); - IgniteFuture<?> fut2 = multithreadedAsync(new Callable() { + InternalFuture<?> fut2 = multithreadedAsync(new Callable() { @Override public Object call() throws Exception { int cnt = 0; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java index a41611e..1a0025e 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java @@ -107,7 +107,7 @@ public class GridCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTest final AtomicBoolean done = new AtomicBoolean(); - IgniteFuture<?> fut1 = multithreadedAsync(new CAX() { + InternalFuture<?> fut1 = multithreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { while (!done.get()) { GridCacheQuery<Map.Entry<Integer, Integer>> qry = @@ -133,7 +133,7 @@ public class GridCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTest for (int i = 0; i < GRID_CNT; i++) grid(i).events().localListen(lsnr, IgniteEventType.EVT_CACHE_PRELOAD_STOPPED); - IgniteFuture<?> fut2 = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> fut2 = multithreadedAsync(new Callable<Object>() { @SuppressWarnings({"BusyWait"}) @Override public Object call() throws Exception { while (!done.get()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java index d72d004..5fe02f2 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.query.*; import org.gridgain.grid.kernal.*; @@ -412,7 +411,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf assertEquals(1, futs.size()); GridCloseableIterator<IgniteBiTuple<Integer, Integer>> iter = - (GridCloseableIterator<IgniteBiTuple<Integer, Integer>>)((IgniteFuture)F.first(futs.values()).get()).get(); + (GridCloseableIterator<IgniteBiTuple<Integer, Integer>>)((InternalFuture)F.first(futs.values()).get()).get(); ResultSet rs = U.field(iter, "data"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexRebuildTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexRebuildTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexRebuildTest.java index b288f0b..7e5f16c 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexRebuildTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexRebuildTest.java @@ -57,7 +57,7 @@ public class GridH2IndexRebuildTest extends GridCacheAbstractSelfTest { try { U.sleep(Long.MAX_VALUE); } - catch (GridInterruptedException ignored) { + catch (InternalInterruptedException ignored) { interrupted = true; } } @@ -199,13 +199,13 @@ public class GridH2IndexRebuildTest extends GridCacheAbstractSelfTest { spi.sleepInRebuild = false; - final IgniteFuture<?> fut1 = grid(0).cache(null).queries().rebuildIndexes(TestValue1.class); + final InternalFuture<?> fut1 = grid(0).cache(null).queries().rebuildIndexes(TestValue1.class); assertFalse(fut1.isCancelled()); fut1.get(); - final IgniteFuture<?> fut2 = grid(0).cache(null).queries().rebuildAllIndexes(); + final InternalFuture<?> fut2 = grid(0).cache(null).queries().rebuildAllIndexes(); assertFalse(fut2.isCancelled()); @@ -215,7 +215,7 @@ public class GridH2IndexRebuildTest extends GridCacheAbstractSelfTest { /** * @throws Exception if failed. */ - private void checkCancel(final IgniteFuture<?> fut) throws Exception { + private void checkCancel(final InternalFuture<?> fut) throws Exception { assertTrue(fut.cancel()); GridTestUtils.assertThrows(log, new Callable<Void>() { @@ -224,7 +224,7 @@ public class GridH2IndexRebuildTest extends GridCacheAbstractSelfTest { fut.get(); return null; } - }, IgniteFutureCancelledException.class, null); + }, InternalFutureCancelledException.class, null); assertTrue(spi.interrupted); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexingGeoSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexingGeoSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexingGeoSelfTest.java index 1f22529..069d712 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexingGeoSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexingGeoSelfTest.java @@ -129,7 +129,7 @@ public class GridH2IndexingGeoSelfTest extends GridCacheAbstractSelfTest { final AtomicBoolean stop = new AtomicBoolean(); final AtomicReference<Exception> err = new AtomicReference<>(); - IgniteFuture<?> putFut = GridTestUtils.runMultiThreadedAsync(new Callable<Void>() { + InternalFuture<?> putFut = GridTestUtils.runMultiThreadedAsync(new Callable<Void>() { @Override public Void call() throws Exception { WKTReader r = new WKTReader(); @@ -153,7 +153,7 @@ public class GridH2IndexingGeoSelfTest extends GridCacheAbstractSelfTest { } }, Runtime.getRuntime().availableProcessors(), "put-thread"); - IgniteFuture<?> qryFut = GridTestUtils.runMultiThreadedAsync(new Callable<Void>() { + InternalFuture<?> qryFut = GridTestUtils.runMultiThreadedAsync(new Callable<Void>() { @Override public Void call() throws Exception { WKTReader r = new WKTReader(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarProjectionPimp.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarProjectionPimp.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarProjectionPimp.scala index 1a18012..637abe8 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarProjectionPimp.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarProjectionPimp.scala @@ -12,7 +12,7 @@ package org.gridgain.scalar.pimps import org.apache.ignite.cluster.{ClusterGroupEmptyException, ClusterGroup, ClusterNode} -import org.apache.ignite.lang.{IgniteFutureCancelledException, IgniteFuture, IgnitePredicate} +import org.apache.ignite.lang.{InternalFutureCancelledException, InternalFuture, IgnitePredicate} import org.apache.ignite._ import org.gridgain.grid._ import org.jetbrains.annotations._ @@ -370,7 +370,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl * @see `org.gridgain.grid.GridProjection.call(...)` */ def callAsync$[R](@Nullable s: Seq[Call[R]], @Nullable p: NF): - IgniteFuture[java.util.Collection[R]] = { + InternalFuture[java.util.Collection[R]] = { val comp = value.ignite().compute(forPredicate(p)).enableAsync() comp.call[R](toJavaCollection(s, (f: Call[R]) => toCallable(f))) @@ -388,7 +388,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl * closures were executed or `null` (see above). * @see `org.gridgain.grid.GridProjection.call(...)` */ - def #?[R](@Nullable s: Seq[Call[R]], @Nullable p: NF): IgniteFuture[java.util.Collection[R]] = { + def #?[R](@Nullable s: Seq[Call[R]], @Nullable p: NF): InternalFuture[java.util.Collection[R]] = { callAsync$(s, p) } @@ -403,7 +403,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl * closures were executed or `null` (see above). * @see `org.gridgain.grid.GridProjection.call(...)` */ - def callAsync$[R](@Nullable s: Call[R], @Nullable p: NF): IgniteFuture[java.util.Collection[R]] = { + def callAsync$[R](@Nullable s: Call[R], @Nullable p: NF): InternalFuture[java.util.Collection[R]] = { callAsync$(Seq(s), p) } @@ -417,7 +417,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl * closures were executed or `null` (see above). * @see `org.gridgain.grid.GridProjection.call(...)` */ - def #?[R](@Nullable s: Call[R], @Nullable p: NF): IgniteFuture[java.util.Collection[R]] = { + def #?[R](@Nullable s: Call[R], @Nullable p: NF): InternalFuture[java.util.Collection[R]] = { callAsync$(s, p) } @@ -430,7 +430,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl * @param p Optional node filter predicate. If `null` provided - all nodes in projection will be used. * @see `org.gridgain.grid.GridProjection.call(...)` */ - def runAsync$(@Nullable s: Seq[Run], @Nullable p: NF): IgniteFuture[_] = { + def runAsync$(@Nullable s: Seq[Run], @Nullable p: NF): InternalFuture[_] = { val comp = value.ignite().compute(forPredicate(p)).enableAsync() comp.run(toJavaCollection(s, (f: Run) => toRunnable(f))) @@ -446,7 +446,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl * @param p Optional node filter predicate. If `null` provided - all nodes in projection will be used. * @see `org.gridgain.grid.GridProjection.call(...)` */ - def *?(@Nullable s: Seq[Run], @Nullable p: NF): IgniteFuture[_] = { + def *?(@Nullable s: Seq[Run], @Nullable p: NF): InternalFuture[_] = { runAsync$(s, p) } @@ -459,7 +459,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl * @param p Optional node filter predicate. If `null` provided - all nodes in projection will be used. * @see `org.gridgain.grid.GridProjection.run(...)` */ - def runAsync$(@Nullable s: Run, @Nullable p: NF): IgniteFuture[_] = { + def runAsync$(@Nullable s: Run, @Nullable p: NF): InternalFuture[_] = { runAsync$(Seq(s), p) } @@ -471,7 +471,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl * @param p Optional node filter predicate. If `null` provided - all nodes in projection will be used. * @see `org.gridgain.grid.GridProjection.run(...)` */ - def *?(@Nullable s: Run, @Nullable p: NF): IgniteFuture[_] = { + def *?(@Nullable s: Run, @Nullable p: NF): InternalFuture[_] = { runAsync$(s, p) } @@ -487,7 +487,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl * @return Future over the reduced result or `null` (see above). * @see `org.gridgain.grid.GridProjection.reduce(...)` */ - def reduceAsync$[R1, R2](s: Seq[Call[R1]], r: Seq[R1] => R2, @Nullable p: NF): IgniteFuture[R2] = { + def reduceAsync$[R1, R2](s: Seq[Call[R1]], r: Seq[R1] => R2, @Nullable p: NF): InternalFuture[R2] = { assert(s != null && r != null) val comp = value.ignite().compute(forPredicate(p)).enableAsync() @@ -508,7 +508,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl * @return Future over the reduced result or `null` (see above). * @see `org.gridgain.grid.GridProjection.reduce(...)` */ - def @?[R1, R2](s: Seq[Call[R1]], r: Seq[R1] => R2, @Nullable p: NF): IgniteFuture[R2] = { + def @?[R1, R2](s: Seq[Call[R1]], r: Seq[R1] => R2, @Nullable p: NF): InternalFuture[R2] = { reduceAsync$(s, r, p) } @@ -594,8 +594,8 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl * Note that in case of dynamic projection this method will take a snapshot of all the * nodes at the time of this call, apply all filtering predicates, if any, and if the * resulting collection of nodes is empty - the exception will be thrown. - * @throws GridInterruptedException Subclass of `IgniteCheckedException` thrown if the wait was interrupted. - * @throws IgniteFutureCancelledException Subclass of `IgniteCheckedException` thrown if computation was cancelled. + * @throws InternalInterruptedException Subclass of `IgniteCheckedException` thrown if the wait was interrupted. + * @throws InternalFutureCancelledException Subclass of `IgniteCheckedException` thrown if computation was cancelled. */ def affinityRun$(cacheName: String, @Nullable affKey: Any, @Nullable r: Run, @Nullable p: NF) { affinityRunAsync$(cacheName, affKey, r, p).get @@ -639,11 +639,11 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl * nodes at the time of this call, apply all filtering predicates, if any, and if the * resulting collection of nodes is empty - the exception will be thrown. * @return Non-cancellable future of this execution. - * @throws GridInterruptedException Subclass of `IgniteCheckedException` thrown if the wait was interrupted. - * @throws IgniteFutureCancelledException Subclass of `IgniteCheckedException` thrown if computation was cancelled. + * @throws InternalInterruptedException Subclass of `IgniteCheckedException` thrown if the wait was interrupted. + * @throws InternalFutureCancelledException Subclass of `IgniteCheckedException` thrown if computation was cancelled. */ def affinityRunAsync$(cacheName: String, @Nullable affKey: Any, @Nullable r: Run, - @Nullable p: NF): IgniteFuture[_] = { + @Nullable p: NF): InternalFuture[_] = { val comp = value.ignite().compute(forPredicate(p)).enableAsync() comp.affinityRun(cacheName, affKey, toRunnable(r)) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java ---------------------------------------------------------------------- diff --git a/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java b/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java index 7fc8996..9d7a9eb 100644 --- a/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java +++ b/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java @@ -70,7 +70,7 @@ class ScheduleFutureImpl<R> extends GridMetadataAwareAdapter implements Schedule private final AtomicBoolean descheduled = new AtomicBoolean(false); /** Listeners. */ - private Collection<IgniteInClosure<? super IgniteFuture<R>>> lsnrs = + private Collection<IgniteInClosure<? super InternalFuture<R>>> lsnrs = new ArrayList<>(1); /** Statistics. */ @@ -569,7 +569,7 @@ class ScheduleFutureImpl<R> extends GridMetadataAwareAdapter implements Schedule } /** {@inheritDoc} */ - @Override public void listenAsync(@Nullable IgniteInClosure<? super IgniteFuture<R>> lsnr) { + @Override public void listenAsync(@Nullable IgniteInClosure<? super InternalFuture<R>> lsnr) { if (lsnr != null) { Throwable err; R res; @@ -599,7 +599,7 @@ class ScheduleFutureImpl<R> extends GridMetadataAwareAdapter implements Schedule } /** {@inheritDoc} */ - @Override public void stopListenAsync(@Nullable IgniteInClosure<? super IgniteFuture<R>>... lsnr) { + @Override public void stopListenAsync(@Nullable IgniteInClosure<? super InternalFuture<R>>... lsnr) { if (!F.isEmpty(lsnr)) synchronized (mux) { lsnrs.removeAll(F.asList(lsnr)); @@ -608,7 +608,7 @@ class ScheduleFutureImpl<R> extends GridMetadataAwareAdapter implements Schedule /** {@inheritDoc} */ @SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor") - @Override public <T> IgniteFuture<T> chain(final IgniteClosure<? super IgniteFuture<R>, T> doneCb) { + @Override public <T> InternalFuture<T> chain(final IgniteClosure<? super InternalFuture<R>, T> doneCb) { final GridFutureAdapter<T> fut = new GridFutureAdapter<T>(ctx, syncNotify) { @Override public String toString() { return "ChainFuture[orig=" + ScheduleFutureImpl.this + ", doneCb=" + doneCb + ']'; @@ -626,7 +626,7 @@ class ScheduleFutureImpl<R> extends GridMetadataAwareAdapter implements Schedule * @param err Last execution error. * @param syncNotify Synchronous notification flag. */ - private void notifyListener(final IgniteInClosure<? super IgniteFuture<R>> lsnr, R res, Throwable err, + private void notifyListener(final IgniteInClosure<? super InternalFuture<R>> lsnr, R res, Throwable err, boolean syncNotify) { assert lsnr != null; assert !Thread.holdsLock(mux); @@ -655,7 +655,7 @@ class ScheduleFutureImpl<R> extends GridMetadataAwareAdapter implements Schedule * @param err Last execution error. */ private void notifyListeners(R res, Throwable err) { - final Collection<IgniteInClosure<? super IgniteFuture<R>>> tmp; + final Collection<IgniteInClosure<? super InternalFuture<R>>> tmp; synchronized (mux) { tmp = new ArrayList<>(lsnrs); @@ -664,7 +664,7 @@ class ScheduleFutureImpl<R> extends GridMetadataAwareAdapter implements Schedule final SchedulerFuture<R> snapshot = snapshot(res, err); if (concurNotify) { - for (final IgniteInClosure<? super IgniteFuture<R>> lsnr : tmp) + for (final IgniteInClosure<? super InternalFuture<R>> lsnr : tmp) ctx.closure().runLocalSafe(new GPR() { @Override public void run() { lsnr.apply(snapshot); @@ -674,7 +674,7 @@ class ScheduleFutureImpl<R> extends GridMetadataAwareAdapter implements Schedule else { ctx.closure().runLocalSafe(new GPR() { @Override public void run() { - for (IgniteInClosure<? super IgniteFuture<R>> lsnr : tmp) + for (IgniteInClosure<? super InternalFuture<R>> lsnr : tmp) lsnr.apply(snapshot); } }, true); @@ -685,12 +685,12 @@ class ScheduleFutureImpl<R> extends GridMetadataAwareAdapter implements Schedule * Checks that the future is in valid state for get operation. * * @return Latch or {@code null} if future has been finished. - * @throws org.apache.ignite.lang.IgniteFutureCancelledException If was cancelled. + * @throws InternalFutureCancelledException If was cancelled. */ - @Nullable private CountDownLatch ensureGet() throws IgniteFutureCancelledException { + @Nullable private CountDownLatch ensureGet() throws InternalFutureCancelledException { synchronized (mux) { if (cancelled) - throw new IgniteFutureCancelledException("Scheduling has been cancelled: " + this); + throw new InternalFutureCancelledException("Scheduling has been cancelled: " + this); if (done) return null; @@ -711,12 +711,12 @@ class ScheduleFutureImpl<R> extends GridMetadataAwareAdapter implements Schedule Thread.currentThread().interrupt(); if (isCancelled()) - throw new IgniteFutureCancelledException(e); + throw new InternalFutureCancelledException(e); if (isDone()) return last(); - throw new GridInterruptedException(e); + throw new InternalInterruptedException(e); } } @@ -737,19 +737,19 @@ class ScheduleFutureImpl<R> extends GridMetadataAwareAdapter implements Schedule if (latch.await(timeout, unit)) return last(); else - throw new IgniteFutureTimeoutException("Timed out waiting for completion of next " + + throw new InternalFutureTimeoutException("Timed out waiting for completion of next " + "scheduled computation: " + this); } catch (InterruptedException e) { Thread.currentThread().interrupt(); if (isCancelled()) - throw new IgniteFutureCancelledException(e); + throw new InternalFutureCancelledException(e); if (isDone()) return last(); - throw new GridInterruptedException(e); + throw new InternalInterruptedException(e); } } @@ -929,17 +929,17 @@ class ScheduleFutureImpl<R> extends GridMetadataAwareAdapter implements Schedule } /** {@inheritDoc} */ - @Override public void listenAsync(@Nullable IgniteInClosure<? super IgniteFuture<R>> lsnr) { + @Override public void listenAsync(@Nullable IgniteInClosure<? super InternalFuture<R>> lsnr) { ref.listenAsync(lsnr); } /** {@inheritDoc} */ - @Override public void stopListenAsync(@Nullable IgniteInClosure<? super IgniteFuture<R>>... lsnr) { + @Override public void stopListenAsync(@Nullable IgniteInClosure<? super InternalFuture<R>>... lsnr) { ref.stopListenAsync(lsnr); } /** {@inheritDoc} */ - @Override public <T> IgniteFuture<T> chain(IgniteClosure<? super IgniteFuture<R>, T> doneCb) { + @Override public <T> InternalFuture<T> chain(IgniteClosure<? super InternalFuture<R>, T> doneCb) { return ref.chain(doneCb); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/schedule/src/test/java/org/gridgain/grid/kernal/GridScheduleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/schedule/src/test/java/org/gridgain/grid/kernal/GridScheduleSelfTest.java b/modules/schedule/src/test/java/org/gridgain/grid/kernal/GridScheduleSelfTest.java index f0b5297..7d72147 100644 --- a/modules/schedule/src/test/java/org/gridgain/grid/kernal/GridScheduleSelfTest.java +++ b/modules/schedule/src/test/java/org/gridgain/grid/kernal/GridScheduleSelfTest.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.apache.ignite.scheduler.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.lang.*; import org.gridgain.testframework.junits.common.*; @@ -55,7 +54,7 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest { */ public void testRunLocal() throws Exception { for (int i = 0; i < NODES_CNT; i++) { - IgniteFuture<?> fut = grid(i).scheduler().runLocal(new TestRunnable()); + InternalFuture<?> fut = grid(i).scheduler().runLocal(new TestRunnable()); assert fut.get() == null; @@ -68,7 +67,7 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest { */ public void testCallLocal() throws Exception { for (int i = 0; i < NODES_CNT; i++) { - IgniteFuture<?> fut = grid(i).scheduler().callLocal(new TestCallable()); + InternalFuture<?> fut = grid(i).scheduler().callLocal(new TestCallable()); assertEquals(1, fut.get()); @@ -105,8 +104,8 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest { final AtomicInteger notifyCnt = new AtomicInteger(); - fut.listenAsync(new CI1<IgniteFuture<?>>() { - @Override public void apply(IgniteFuture<?> e) { + fut.listenAsync(new CI1<InternalFuture<?>>() { + @Override public void apply(InternalFuture<?> e) { notifyCnt.incrementAndGet(); } }); @@ -163,8 +162,8 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest { final AtomicInteger notifyCnt = new AtomicInteger(); - fut.listenAsync(new CI1<IgniteFuture<?>>() { - @Override public void apply(IgniteFuture<?> e) { + fut.listenAsync(new CI1<InternalFuture<?>>() { + @Override public void apply(InternalFuture<?> e) { notifyCnt.incrementAndGet(); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceConcurrentUndeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceConcurrentUndeploySelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceConcurrentUndeploySelfTest.java index 4947af2..d4c5e1c 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceConcurrentUndeploySelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceConcurrentUndeploySelfTest.java @@ -15,7 +15,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.junits.common.*; @@ -111,7 +110,7 @@ public class GridResourceConcurrentUndeploySelfTest extends GridCommonAbstractTe cnt = new CountDownLatch(2); - ComputeTaskFuture<?> res = executeAsync(ignite1.compute(), UserResourceTask1.class, true); + InternalComputeTaskFuture<?> res = executeAsync(ignite1.compute(), UserResourceTask1.class, true); executeAsync(ignite3.compute(), UserResourceTask2.class, false).get(); @@ -158,7 +157,7 @@ public class GridResourceConcurrentUndeploySelfTest extends GridCommonAbstractTe cnt = new CountDownLatch(1); - ComputeTaskFuture<?> res = executeAsync(ignite.compute(), UserResourceTask1.class, true); + InternalComputeTaskFuture<?> res = executeAsync(ignite.compute(), UserResourceTask1.class, true); cnt.await(); @@ -196,7 +195,7 @@ public class GridResourceConcurrentUndeploySelfTest extends GridCommonAbstractTe cnt = new CountDownLatch(1); - ComputeTaskFuture<?> res = executeAsync(ignite1.compute(), UserResourceTask1.class, true); + InternalComputeTaskFuture<?> res = executeAsync(ignite1.compute(), UserResourceTask1.class, true); cnt.await(); @@ -238,7 +237,7 @@ public class GridResourceConcurrentUndeploySelfTest extends GridCommonAbstractTe Class task1 = ldr.loadClass("org.gridgain.grid.tests.p2p.GridP2PTestTaskExternalPath1"); - ComputeTaskFuture res = + InternalComputeTaskFuture res = executeAsync(ignite1.compute(), task1, new Object[] {ignite2.cluster().localNode().id(), true}); waitForEvent(ignite2, EVT_JOB_STARTED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java ---------------------------------------------------------------------- diff --git a/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java b/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java index 2189f3e..e0ad0f1 100644 --- a/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java +++ b/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java @@ -189,7 +189,7 @@ public class GridNodeCallableImpl implements GridNodeCallable { return new GridTuple3<>(spec.host(), true, null); } - catch (GridInterruptedException e) { + catch (InternalInterruptedException e) { return new GridTuple3<>(spec.host(), false, e.getMessage()); } catch (Exception e) { @@ -208,9 +208,9 @@ public class GridNodeCallableImpl implements GridNodeCallable { * @param cmd Command. * @throws JSchException In case of SSH error. * @throws IOException If IO error occurs. - * @throws GridInterruptedException If thread was interrupted while waiting. + * @throws InternalInterruptedException If thread was interrupted while waiting. */ - private void shell(Session ses, String cmd) throws JSchException, IOException, GridInterruptedException { + private void shell(Session ses, String cmd) throws JSchException, IOException, InternalInterruptedException { ChannelShell ch = null; try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpi.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpi.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpi.java index ed5c1a7..359de38 100644 --- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpi.java +++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpi.java @@ -534,7 +534,7 @@ public class GridUriDeploymentSpi extends IgniteSpiAdapter implements Deployment try { U.sleep(10000); } - catch (GridInterruptedException ignored) { + catch (InternalInterruptedException ignored) { // No-op } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/urideploy/src/test/java/org/gridgain/grid/kernal/GridTaskUriDeploymentDeadlockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/gridgain/grid/kernal/GridTaskUriDeploymentDeadlockSelfTest.java b/modules/urideploy/src/test/java/org/gridgain/grid/kernal/GridTaskUriDeploymentDeadlockSelfTest.java index 3722afd..930f575 100644 --- a/modules/urideploy/src/test/java/org/gridgain/grid/kernal/GridTaskUriDeploymentDeadlockSelfTest.java +++ b/modules/urideploy/src/test/java/org/gridgain/grid/kernal/GridTaskUriDeploymentDeadlockSelfTest.java @@ -70,7 +70,7 @@ public class GridTaskUriDeploymentDeadlockSelfTest extends GridCommonAbstractTes } }, EVT_NODE_JOINED); - IgniteFuture<?> f = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> f = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { startGrid(2); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/web/src/test/java/org/gridgain/grid/kernal/websession/GridWebSessionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/web/src/test/java/org/gridgain/grid/kernal/websession/GridWebSessionSelfTest.java b/modules/web/src/test/java/org/gridgain/grid/kernal/websession/GridWebSessionSelfTest.java index e63ab68..69b3bf2 100644 --- a/modules/web/src/test/java/org/gridgain/grid/kernal/websession/GridWebSessionSelfTest.java +++ b/modules/web/src/test/java/org/gridgain/grid/kernal/websession/GridWebSessionSelfTest.java @@ -110,7 +110,7 @@ public class GridWebSessionSelfTest extends GridCommonAbstractTest { final AtomicBoolean stop = new AtomicBoolean(); - IgniteFuture<?> restarterFut = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { + InternalFuture<?> restarterFut = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { @SuppressWarnings("BusyWait") @Override public Object call() throws Exception { Random rnd = new Random();
