http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/jvmtest/ReadWriteLockMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/jvmtest/ReadWriteLockMultiThreadedTest.java b/modules/core/src/test/java/org/gridgain/jvmtest/ReadWriteLockMultiThreadedTest.java index 8169075..c13dfba 100644 --- a/modules/core/src/test/java/org/gridgain/jvmtest/ReadWriteLockMultiThreadedTest.java +++ b/modules/core/src/test/java/org/gridgain/jvmtest/ReadWriteLockMultiThreadedTest.java @@ -54,7 +54,7 @@ public class ReadWriteLockMultiThreadedTest extends TestCase { X.println("Read lock acquired."); - IgniteFuture fut1 = GridTestUtils.runMultiThreadedAsync( + InternalFuture fut1 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { X.println("Attempting to acquire write lock: " + lock); @@ -77,7 +77,7 @@ public class ReadWriteLockMultiThreadedTest extends TestCase { Thread.sleep(2000); - IgniteFuture fut2 = GridTestUtils.runMultiThreadedAsync( + InternalFuture fut2 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { X.println("Attempting to acquire read lock: " + lock); @@ -123,7 +123,7 @@ public class ReadWriteLockMultiThreadedTest extends TestCase { X.println("Write lock acquired: " + lock); - IgniteFuture fut = GridTestUtils.runMultiThreadedAsync( + InternalFuture fut = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { X.println("Attempting to acquire read lock: " + lock); @@ -168,7 +168,7 @@ public class ReadWriteLockMultiThreadedTest extends TestCase { X.println("Read lock acquired."); - IgniteFuture fut = GridTestUtils.runMultiThreadedAsync( + InternalFuture 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/90948e67/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java index 256c896..02bb8af 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java @@ -14,7 +14,6 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.log4j.*; import org.apache.log4j.varia.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; @@ -128,7 +127,7 @@ abstract class GridCacheAbstractLoadTest { assert cache != null; try { - IgniteFuture<?> f1 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { + InternalFuture<?> f1 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { @Nullable @Override public Object call() throws Exception { long start = System.currentTimeMillis(); @@ -150,7 +149,7 @@ abstract class GridCacheAbstractLoadTest { } }, writeThreads(), "cache-load-test-worker"); - IgniteFuture<?> f2 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { + InternalFuture<?> 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/90948e67/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSwapLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSwapLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSwapLoadTest.java index 9a4aa47..4d91f93 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSwapLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSwapLoadTest.java @@ -12,7 +12,6 @@ package org.gridgain.loadtests.cache; import org.apache.ignite.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; @@ -116,7 +115,7 @@ public class GridCacheSwapLoadTest { } }, EVT_CACHE_OBJECT_SWAPPED); - Collection<IgniteFuture<?>> futs = new ArrayList<>(3); + Collection<InternalFuture<?>> futs = new ArrayList<>(3); long start = System.currentTimeMillis(); @@ -190,7 +189,7 @@ public class GridCacheSwapLoadTest { /** * @return Future. */ - private static IgniteFuture<?> doPut(final Ignite g) { + private static InternalFuture<?> doPut(final Ignite g) { final AtomicInteger putKey = new AtomicInteger(0); return GridTestUtils.runMultiThreadedAsync(new CAX() { @@ -219,7 +218,7 @@ public class GridCacheSwapLoadTest { /** * @return Futures. */ - private static Collection<IgniteFuture<Long>> doGetRemove(final Ignite g) { + private static Collection<InternalFuture<Long>> doGetRemove(final Ignite g) { final AtomicBoolean stop = new AtomicBoolean(false); return F.asList( @@ -293,9 +292,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<InternalFuture<?>> futs) { + F.forEach(futs, new CIX1<InternalFuture<?>>() { + @Override public void applyx(InternalFuture<?> fut) throws IgniteCheckedException { fut.get(); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java index 89b871c..af79be6 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java @@ -146,7 +146,7 @@ public class GridCacheWriteBehindStoreLoadTest extends GridCommonAbstractTest { long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + InternalFuture<?> fut = multithreadedAsync(new Runnable() { @SuppressWarnings({"NullableProblems"}) @Override public void run() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java index 091f3fb..157a01a 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.thread.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.*; import org.springframework.beans.factory.*; @@ -66,7 +65,7 @@ public class GridTestMain { final GridCache<GridTestKey, Long> cache = g.cache("partitioned"); - final BlockingQueue<IgniteFuture> q = new ArrayBlockingQueue<>(400); + final BlockingQueue<InternalFuture> q = new ArrayBlockingQueue<>(400); long start = System.currentTimeMillis(); @@ -86,12 +85,12 @@ public class GridTestMain { } }); - final IgniteFuture<?> f = comp.future(); + final InternalFuture<?> f = comp.future(); q.put(f); - f.listenAsync(new CI1<IgniteFuture<?>>() { - @Override public void apply(IgniteFuture<?> o) { + f.listenAsync(new CI1<InternalFuture<?>>() { + @Override public void apply(InternalFuture<?> o) { q.poll(); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark.java b/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark.java index 8d82c98..2344a38 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark.java @@ -167,7 +167,7 @@ public class GridIoManagerBenchmark { queries = newQueries; } } - catch (GridInterruptedException ignored) { + catch (InternalInterruptedException ignored) { // No-op. } @@ -200,7 +200,7 @@ public class GridIoManagerBenchmark { try { U.sleep(duration > 0 ? duration * 1000 + WARM_UP_DUR : Long.MAX_VALUE); } - catch (GridInterruptedException ignored) { + catch (InternalInterruptedException ignored) { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark0.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark0.java b/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark0.java index 84be76e..ac9f02a 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark0.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark0.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; import org.apache.ignite.spi.communication.*; @@ -152,7 +151,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { final AtomicBoolean finish = new AtomicBoolean(); - IgniteFuture<?> f = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { + InternalFuture<?> f = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { try { IgniteUuid msgId = IgniteUuid.randomUuid(); @@ -244,7 +243,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { final AtomicBoolean finish = new AtomicBoolean(); - IgniteFuture<?> f = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { + InternalFuture<?> f = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { try { IgniteUuid msgId = IgniteUuid.randomUuid(); @@ -334,7 +333,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { final AtomicBoolean finish = new AtomicBoolean(); final AtomicReference<CountDownLatch> latchRef = new AtomicReference<>(); - IgniteFuture<?> f = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { + InternalFuture<?> f = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { while (!finish.get()) { CountDownLatch latch = latchRef.get(); @@ -353,7 +352,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { } }, THREADS, "send-thread"); - IgniteFuture<?> f1 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { + InternalFuture<?> f1 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { private long ts = System.currentTimeMillis(); @Override public Object call() throws Exception { @@ -406,7 +405,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { } }, 1, "load-dispatcher"); - IgniteFuture<?> f2 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { + InternalFuture<?> f2 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { while (!finish.get()) { U.sleep(1000); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/loadtests/continuous/GridContinuousOperationsLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/continuous/GridContinuousOperationsLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/continuous/GridContinuousOperationsLoadTest.java index 3918e76..89f5194 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/continuous/GridContinuousOperationsLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/continuous/GridContinuousOperationsLoadTest.java @@ -93,7 +93,7 @@ public class GridContinuousOperationsLoadTest { qry.callback(new PX2<UUID, Collection<Map.Entry<Object, Object>>>() { @Override public boolean applyx(UUID uuid, Collection<Map.Entry<Object, Object>> entries) - throws GridInterruptedException { + throws InternalInterruptedException { if (cbSleepMs > 0) U.sleep(cbSleepMs); @@ -104,7 +104,7 @@ public class GridContinuousOperationsLoadTest { }); qry.filter(new PX2<Object, Object>() { - @Override public boolean applyx(Object key, Object val) throws GridInterruptedException { + @Override public boolean applyx(Object key, Object val) throws InternalInterruptedException { if (filterSleepMs > 0) U.sleep(filterSleepMs); @@ -125,7 +125,7 @@ public class GridContinuousOperationsLoadTest { new PX2<UUID, IgniteEvent>() { @Override public boolean applyx(UUID uuid, IgniteEvent evt) - throws GridInterruptedException { + throws InternalInterruptedException { if (cbSleepMs > 0) U.sleep(cbSleepMs); @@ -136,7 +136,7 @@ public class GridContinuousOperationsLoadTest { }, new PX1<IgniteEvent>() { @Override - public boolean applyx(IgniteEvent evt) throws GridInterruptedException { + public boolean applyx(IgniteEvent evt) throws InternalInterruptedException { if (filterSleepMs > 0) U.sleep(filterSleepMs); @@ -165,7 +165,7 @@ public class GridContinuousOperationsLoadTest { ", updatesPerSec=" + updDelta + ']'); } } - catch (GridInterruptedException ignored) { + catch (InternalInterruptedException ignored) { // No-op. } } @@ -174,7 +174,7 @@ public class GridContinuousOperationsLoadTest { X.println("Starting " + threadsCnt + " generator thread(s)."); // Start generator threads. - IgniteFuture<Long> genFut = runMultiThreadedAsync(new Callable<Object>() { + InternalFuture<Long> genFut = runMultiThreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { byte[] val = new byte[valSize]; ThreadLocalRandom8 rnd = ThreadLocalRandom8.current(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java index 0276456..5ace1cf 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java @@ -12,7 +12,6 @@ package org.gridgain.loadtests.direct.multisplit; import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.*; import org.gridgain.grid.loadtest.*; import org.apache.ignite.spi.communication.*; import org.apache.ignite.spi.communication.tcp.*; @@ -112,7 +111,7 @@ public class GridMultiSplitsLoadTest extends GridCommonAbstractTest { try { comp.execute(GridLoadTestTask.class, levels); - ComputeTaskFuture<Integer> fut = comp.future(); + InternalComputeTaskFuture<Integer> fut = comp.future(); int res = fut.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java index 1e473f7..26e54cc 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java @@ -12,7 +12,6 @@ package org.gridgain.loadtests.direct.multisplit; import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.*; import org.gridgain.grid.loadtest.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; @@ -96,7 +95,7 @@ public class GridMultiSplitsRedeployLoadTest extends GridCommonAbstractTest { long start = System.currentTimeMillis(); try { - ComputeTaskFuture<Integer> fut = ignite.compute().withTimeout(10000). + InternalComputeTaskFuture<Integer> fut = ignite.compute().withTimeout(10000). execute(TASK_TYPE_ID, levels); int res = fut.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java index 178c902..acf92b6 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java @@ -150,7 +150,7 @@ public abstract class GridSingleSplitsNewNodesAbstractLoadTest extends GridCommo comp.execute(new GridSingleSplitNewNodesTestTask(), levels); - ComputeTaskFuture<Integer> fut = comp.future(); + InternalComputeTaskFuture<Integer> fut = comp.future(); int res = fut.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java index fce9b85..2376097 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java @@ -12,7 +12,6 @@ package org.gridgain.loadtests.direct.redeploy; import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.*; import org.gridgain.grid.loadtest.*; import org.apache.ignite.spi.communication.*; import org.apache.ignite.spi.communication.tcp.*; @@ -132,7 +131,7 @@ public class GridSingleSplitsRedeployLoadTest extends GridCommonAbstractTest { // info("Executing task: " + TASK_NAME); - ComputeTaskFuture<Integer> fut = ignite.compute().execute(TASK_NAME, levels); + InternalComputeTaskFuture<Integer> fut = ignite.compute().execute(TASK_NAME, levels); int res = fut.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTest.java index b0d134d..dc651ac 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTest.java @@ -75,7 +75,7 @@ public class GridSessionLoadTest extends GridCommonAbstractTest { while (end - System.currentTimeMillis() > 0) { long start = System.currentTimeMillis(); - ComputeTaskFuture<?> fut = ignite.compute().withTimeout(10000). + InternalComputeTaskFuture<?> fut = ignite.compute().withTimeout(10000). execute(GridSessionLoadTestTask.class.getName(), ignite.cluster().nodes().size()); Object res = fut.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTest.java index 8340e9c..44bc7a1 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTest.java @@ -115,7 +115,7 @@ public class GridStealingLoadTest extends GridCommonAbstractTest { long start = System.currentTimeMillis(); // Pass stealing node id. - ComputeTaskFuture<?> fut = ignite.compute().withTimeout(20000). + InternalComputeTaskFuture<?> fut = ignite.compute().withTimeout(20000). execute(GridStealingLoadTestTask.class.getName(), stealingNodeId); stolen.addAndGet((Integer)fut.get()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiClient.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiClient.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiClient.java index 05de5b8..83c12a6 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiClient.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiClient.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; @@ -105,7 +104,7 @@ public class GridDsiClient implements Callable { comp.execute(GridDsiRequestTask.class, new GridDsiMessage(terminalId, nodeId)); - ComputeTaskFuture<T3<Long, Integer, Integer>> f1 = comp.future(); + InternalComputeTaskFuture<T3<Long, Integer, Integer>> f1 = comp.future(); submitTime.setIfGreater(System.currentTimeMillis() - submitTime1); @@ -115,7 +114,7 @@ public class GridDsiClient implements Callable { comp.execute(GridDsiResponseTask.class, new GridDsiMessage(terminalId, nodeId)); - ComputeTaskFuture<T3<Long, Integer, Integer>> f2 = comp.future(); + InternalComputeTaskFuture<T3<Long, Integer, Integer>> f2 = comp.future(); submitTime.setIfGreater(System.currentTimeMillis() - submitTime1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java index d0f6735..c71f3e6 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.loadtests.util.*; @@ -50,8 +49,8 @@ public class GridJobExecutionLoadTestClientSemaphore implements Callable<Object> /** {@inheritDoc} */ @SuppressWarnings("InfiniteLoopStatement") @Nullable @Override public Object call() throws Exception { - final IgniteInClosure<IgniteFuture<?>> lsnr = new CI1<IgniteFuture<?>>() { - @Override public void apply(IgniteFuture<?> t) { + final IgniteInClosure<InternalFuture<?>> lsnr = new CI1<InternalFuture<?>>() { + @Override public void apply(InternalFuture<?> t) { tasksSem.release(); } }; @@ -65,7 +64,7 @@ public class GridJobExecutionLoadTestClientSemaphore implements Callable<Object> comp.execute(GridJobExecutionLoadTestTask.class, null); - ComputeTaskFuture<Object> f = comp.future(); + InternalComputeTaskFuture<Object> f = comp.future(); f.listenAsync(lsnr); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java index 851a083..ebd2edb 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java @@ -86,7 +86,7 @@ public class GridJobExecutionSingleNodeSemaphoreLoadTest { X.println("Running main test."); - IgniteFuture<Void> collectorFut = GridTestUtils.runAsync(new Callable<Void>() { + InternalFuture<Void> collectorFut = GridTestUtils.runAsync(new Callable<Void>() { @Override public Void call() throws Exception { GridCumulativeAverage avgTasksPerSec = new GridCumulativeAverage(); @@ -101,7 +101,7 @@ public class GridJobExecutionSingleNodeSemaphoreLoadTest { avgTasksPerSec.update(curTasksPerSec); } } - catch (GridInterruptedException ignored) { + catch (InternalInterruptedException ignored) { X.println(">>> Interrupted."); Thread.currentThread().interrupt(); @@ -156,8 +156,8 @@ public class GridJobExecutionSingleNodeSemaphoreLoadTest { final LongAdder iterCntr) { final Semaphore sem = new Semaphore(taskCnt); - final IgniteInClosure<IgniteFuture> lsnr = new CI1<IgniteFuture>() { - @Override public void apply(IgniteFuture t) { + final IgniteInClosure<InternalFuture> lsnr = new CI1<InternalFuture>() { + @Override public void apply(InternalFuture t) { sem.release(); } }; @@ -170,7 +170,7 @@ public class GridJobExecutionSingleNodeSemaphoreLoadTest { comp.execute(GridJobExecutionLoadTestTask.class, null); - ComputeTaskFuture<Object> f = comp.future(); + InternalComputeTaskFuture<Object> f = comp.future(); f.listenAsync(lsnr); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestSubmitter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestSubmitter.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestSubmitter.java index f9b7084..e68cb43 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestSubmitter.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestSubmitter.java @@ -12,7 +12,6 @@ package org.gridgain.loadtests.job; import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import java.util.*; @@ -36,7 +35,7 @@ public class GridJobLoadTestSubmitter implements Runnable { private final int cancelRate; /** List of futures for submitted tasks. */ - private final List<ComputeTaskFuture<Integer>> futures = new LinkedList<>(); + private final List<InternalComputeTaskFuture<Integer>> futures = new LinkedList<>(); /** Counter to implement fixed submit/cancel ratio. */ private int iteration; @@ -87,8 +86,8 @@ public class GridJobLoadTestSubmitter implements Runnable { * Finds completed tasks in the queue and removes them. */ private void checkCompletion() { - for (Iterator<ComputeTaskFuture<Integer>> iter = futures.iterator(); iter.hasNext();) { - ComputeTaskFuture<Integer> fut = iter.next(); + for (Iterator<InternalComputeTaskFuture<Integer>> iter = futures.iterator(); iter.hasNext();) { + InternalComputeTaskFuture<Integer> fut = iter.next(); if (fut.isDone()) { try { @@ -99,7 +98,7 @@ public class GridJobLoadTestSubmitter implements Runnable { ignite.log().info(">>> Task completed successfully. Task id: " + fut.getTaskSession().getId()); } - catch (IgniteFutureCancelledException ignored) { + catch (InternalFutureCancelledException ignored) { ignite.log().info(">>> Task cancelled: " + fut.getTaskSession().getId()); } catch (IgniteCheckedException e) { @@ -121,7 +120,7 @@ public class GridJobLoadTestSubmitter implements Runnable { if (iteration % cancelRate == 0) { // Here we should have mostly running futures so just pick one. - ComputeTaskFuture<Integer> futToCancel = futures.get( new Random().nextInt(futures.size()) ); + InternalComputeTaskFuture<Integer> futToCancel = futures.get( new Random().nextInt(futures.size()) ); try { futToCancel.cancel(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/loadtests/mergesort/GridMergeSortLoadTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/mergesort/GridMergeSortLoadTask.java b/modules/core/src/test/java/org/gridgain/loadtests/mergesort/GridMergeSortLoadTask.java index 9795503..bb13f00 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/mergesort/GridMergeSortLoadTask.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/mergesort/GridMergeSortLoadTask.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.typedef.*; import java.util.*; @@ -52,7 +51,7 @@ public class GridMergeSortLoadTask extends ComputeTaskSplitAdapter<int[], int[]> private ComputeJobContext jobCtx; // Task execution result future. - private ComputeTaskFuture<int[]> fut; + private InternalComputeTaskFuture<int[]> fut; @Override public Object execute() throws IgniteCheckedException { if (arr.length == 1) @@ -70,8 +69,8 @@ public class GridMergeSortLoadTask extends ComputeTaskSplitAdapter<int[], int[]> // Add a listener to the future, that will resume the // parent task once the child one is completed. - fut.listenAsync(new CI1<IgniteFuture<int[]>>() { - @Override public void apply(IgniteFuture<int[]> fut) { + fut.listenAsync(new CI1<InternalFuture<int[]>>() { + @Override public void apply(InternalFuture<int[]> fut) { // CONTINUATION: // ============= // Resume suspended job execution. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java b/modules/core/src/test/java/org/gridgain/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java index 934b80d..9e5286f 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java @@ -160,7 +160,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); @@ -215,7 +215,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); @@ -286,7 +286,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); @@ -341,7 +341,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> 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/90948e67/modules/core/src/test/java/org/gridgain/loadtests/streamer/GridStreamerIndexLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/streamer/GridStreamerIndexLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/streamer/GridStreamerIndexLoadTest.java index a84268b..378e811 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/streamer/GridStreamerIndexLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/streamer/GridStreamerIndexLoadTest.java @@ -107,7 +107,7 @@ public class GridStreamerIndexLoadTest { final AtomicLong enqueueCntr = new AtomicLong(); - IgniteFuture<Long> enqueueFut = runMultiThreadedAsync(new CAX() { + InternalFuture<Long> enqueueFut = runMultiThreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { Random rnd = new Random(); @@ -121,7 +121,7 @@ public class GridStreamerIndexLoadTest { final AtomicLong evictCntr = new AtomicLong(); - IgniteFuture<Long> evictFut = runMultiThreadedAsync(new CAX() { + InternalFuture<Long> evictFut = runMultiThreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { while (!Thread.currentThread().isInterrupted()) { win.pollEvicted(); @@ -131,7 +131,7 @@ public class GridStreamerIndexLoadTest { } }, thrCnt, "evictor"); - IgniteFuture<Long> collFut = runMultiThreadedAsync(new CAX() { + InternalFuture<Long> collFut = runMultiThreadedAsync(new CAX() { @Override public void applyx() { int nSec = 0; long prevEnqueue = enqueueCntr.get(); @@ -152,7 +152,7 @@ public class GridStreamerIndexLoadTest { prevEvict = curEvict; } } - catch (GridInterruptedException ignored) { + catch (InternalInterruptedException ignored) { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/loadtests/streamer/QueryClosure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/streamer/QueryClosure.java b/modules/core/src/test/java/org/gridgain/loadtests/streamer/QueryClosure.java index 125cf6e..704c15e 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/streamer/QueryClosure.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/streamer/QueryClosure.java @@ -35,7 +35,7 @@ class QueryClosure implements IgniteInClosure<IgniteStreamer> { try { U.sleep(warmup); } - catch (GridInterruptedException ignore) { + catch (InternalInterruptedException ignore) { return; } @@ -48,7 +48,7 @@ class QueryClosure implements IgniteInClosure<IgniteStreamer> { try { U.sleep(SLEEP_PERIOD_SEC * 1000); } - catch (GridInterruptedException ignore) { + catch (InternalInterruptedException ignore) { return; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/testframework/GridTestSafeThreadFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/GridTestSafeThreadFactory.java b/modules/core/src/test/java/org/gridgain/testframework/GridTestSafeThreadFactory.java index 199153e..d6b1b52 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/GridTestSafeThreadFactory.java +++ b/modules/core/src/test/java/org/gridgain/testframework/GridTestSafeThreadFactory.java @@ -149,7 +149,7 @@ public final class GridTestSafeThreadFactory implements ThreadFactory { for (Thread t : threads) U.join(t); } - catch (GridInterruptedException ignored) { + catch (InternalInterruptedException ignored) { // No-op. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java b/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java index bdd7042..9c1957e 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java @@ -448,7 +448,7 @@ public final class GridTestUtils { * @param threadName Thread name. * @return Future for the run. Future returns execution time in milliseconds. */ - public static IgniteFuture<Long> runMultiThreadedAsync(Runnable run, int threadNum, String threadName) { + public static InternalFuture<Long> runMultiThreadedAsync(Runnable run, int threadNum, String threadName) { return runMultiThreadedAsync(makeCallable(run, null), threadNum, threadName); } @@ -476,7 +476,7 @@ public final class GridTestUtils { * @return Future for the run. Future returns execution time in milliseconds. */ @SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor") - public static IgniteFuture<Long> runMultiThreadedAsync(Callable<?> call, int threadNum, final String threadName) { + public static InternalFuture<Long> runMultiThreadedAsync(Callable<?> call, int threadNum, final String threadName) { final List<Callable<?>> calls = Collections.<Callable<?>>nCopies(threadNum, call); final GridTestSafeThreadFactory threadFactory = new GridTestSafeThreadFactory(threadName); @@ -496,7 +496,7 @@ public final class GridTestUtils { }; // Async execution future (doesn't support cancel()). - IgniteFuture<Long> runFut = runAsync(new Callable<Long>() { + InternalFuture<Long> runFut = runAsync(new Callable<Long>() { @Override public Long call() throws Exception { return runMultiThreaded(calls, threadFactory); } @@ -574,7 +574,7 @@ public final class GridTestUtils { * @return Future with task result. */ @SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor") - public static <T> IgniteFuture<T> runAsync(final Callable<T> task) { + public static <T> InternalFuture<T> runAsync(final Callable<T> task) { if (!busyLock.enterBusy()) throw new IllegalStateException("Failed to start new threads (test is being stopped)."); @@ -1169,11 +1169,11 @@ public final class GridTestUtils { * @param retryInterval Interval between retries in milliseconds. * @param c Closure with assertion. All {@link AssertionError}s thrown * from this closure will be ignored {@code retries} times. - * @throws GridInterruptedException If interrupted. + * @throws InternalInterruptedException If interrupted. */ @SuppressWarnings("ErrorNotRethrown") public static void retryAssert(@Nullable IgniteLogger log, int retries, long retryInterval, GridAbsClosure c) - throws GridInterruptedException { + throws InternalInterruptedException { for (int i = 0; i < retries; i++) { try { c.apply(); @@ -1226,9 +1226,9 @@ public final class GridTestUtils { * @param sleepDur Sleep duration in milliseconds. * @param i Integer to increment. * @return Incremented value. - * @throws GridInterruptedException If sleep was interrupted. + * @throws InternalInterruptedException If sleep was interrupted. */ - public static int sleepAndIncrement(int sleepDur, int i) throws GridInterruptedException { + public static int sleepAndIncrement(int sleepDur, int i) throws InternalInterruptedException { U.sleep(sleepDur); return i + 1; @@ -1240,9 +1240,9 @@ public final class GridTestUtils { * @param cond Condition to wait for. * @param timeout Max time to wait in milliseconds. * @return {@code true} if condition was achieved, {@code false} otherwise. - * @throws GridInterruptedException If interrupted. + * @throws InternalInterruptedException If interrupted. */ - public static boolean waitForCondition(GridAbsPredicate cond, long timeout) throws GridInterruptedException { + public static boolean waitForCondition(GridAbsPredicate cond, long timeout) throws InternalInterruptedException { long curTime = U.currentTimeMillis(); long endTime = curTime + timeout; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java index 570bc77..d93568d 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java @@ -19,7 +19,6 @@ import org.apache.ignite.marshaller.*; import org.apache.ignite.marshaller.jdk.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.log4j.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.license.*; @@ -282,7 +281,7 @@ public abstract class GridAbstractTest extends TestCase { * @throws Exception If failed. * @return Future. */ - protected IgniteFuture<?> multithreadedAsync(Runnable r, int threadNum) throws Exception { + protected InternalFuture<?> multithreadedAsync(Runnable r, int threadNum) throws Exception { return multithreadedAsync(r, threadNum, getTestGridName()); } @@ -297,7 +296,7 @@ public abstract class GridAbstractTest extends TestCase { * @throws Exception If failed. * @return Future. */ - protected IgniteFuture<?> multithreadedAsync(Runnable r, int threadNum, String threadName) throws Exception { + protected InternalFuture<?> multithreadedAsync(Runnable r, int threadNum, String threadName) throws Exception { return GridTestUtils.runMultiThreadedAsync(r, threadNum, threadName); } @@ -335,7 +334,7 @@ public abstract class GridAbstractTest extends TestCase { * @throws Exception If failed. * @return Future. */ - protected IgniteFuture<?> multithreadedAsync(Callable<?> c, int threadNum) throws Exception { + protected InternalFuture<?> multithreadedAsync(Callable<?> c, int threadNum) throws Exception { return multithreadedAsync(c, threadNum, getTestGridName()); } @@ -349,7 +348,7 @@ public abstract class GridAbstractTest extends TestCase { * @throws Exception If failed. * @return Future. */ - protected IgniteFuture<?> multithreadedAsync(Callable<?> c, int threadNum, String threadName) throws Exception { + protected InternalFuture<?> multithreadedAsync(Callable<?> c, int threadNum, String threadName) throws Exception { return GridTestUtils.runMultiThreadedAsync(c, threadNum, threadName); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java index 2c56601..ceb2fd0 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java @@ -483,7 +483,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends GridCacheStore<Ob } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<GridCacheTx> commitAsync() { + @Nullable @Override public InternalFuture<GridCacheTx> commitAsync() { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java index 095d05a..d3285f1 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java @@ -15,7 +15,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.kernal.*; @@ -430,13 +429,13 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Task future. * @throws IgniteCheckedException If failed. */ - protected <R> ComputeTaskFuture<R> executeAsync(IgniteCompute comp, ComputeTask task, @Nullable Object arg) + protected <R> InternalComputeTaskFuture<R> executeAsync(IgniteCompute comp, ComputeTask task, @Nullable Object arg) throws IgniteCheckedException { comp = comp.enableAsync(); assertNull(comp.execute(task, arg)); - ComputeTaskFuture<R> fut = comp.future(); + InternalComputeTaskFuture<R> fut = comp.future(); assertNotNull(fut); @@ -450,13 +449,13 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Task future. * @throws IgniteCheckedException If failed. */ - protected <R> ComputeTaskFuture<R> executeAsync(IgniteCompute comp, String taskName, @Nullable Object arg) + protected <R> InternalComputeTaskFuture<R> executeAsync(IgniteCompute comp, String taskName, @Nullable Object arg) throws IgniteCheckedException { comp = comp.enableAsync(); assertNull(comp.execute(taskName, arg)); - ComputeTaskFuture<R> fut = comp.future(); + InternalComputeTaskFuture<R> fut = comp.future(); assertNotNull(fut); @@ -471,13 +470,13 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @throws IgniteCheckedException If failed. */ @SuppressWarnings("unchecked") - protected <R> ComputeTaskFuture<R> executeAsync(IgniteCompute comp, Class taskCls, @Nullable Object arg) + protected <R> InternalComputeTaskFuture<R> executeAsync(IgniteCompute comp, Class taskCls, @Nullable Object arg) throws IgniteCheckedException { comp = comp.enableAsync(); assertNull(comp.execute(taskCls, arg)); - ComputeTaskFuture<R> fut = comp.future(); + InternalComputeTaskFuture<R> fut = comp.future(); assertNotNull(fut); @@ -491,7 +490,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { * @return Future. * @throws IgniteCheckedException If failed. */ - protected <T extends IgniteEvent> IgniteFuture<T> waitForLocalEvent(IgniteEvents evts, + protected <T extends IgniteEvent> InternalFuture<T> waitForLocalEvent(IgniteEvents evts, @Nullable IgnitePredicate<T> filter, @Nullable int... types) throws IgniteCheckedException { evts = evts.enableAsync(); @@ -499,7 +498,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { assertNull(evts.waitForLocal(filter, types)); - IgniteFuture<T> fut = evts.future(); + InternalFuture<T> fut = evts.future(); assertNotNull(fut); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/email/src/main/java/org/gridgain/grid/kernal/processors/email/GridEmailProcessor.java ---------------------------------------------------------------------- diff --git a/modules/email/src/main/java/org/gridgain/grid/kernal/processors/email/GridEmailProcessor.java b/modules/email/src/main/java/org/gridgain/grid/kernal/processors/email/GridEmailProcessor.java index a2e7b27..ae0a40b 100644 --- a/modules/email/src/main/java/org/gridgain/grid/kernal/processors/email/GridEmailProcessor.java +++ b/modules/email/src/main/java/org/gridgain/grid/kernal/processors/email/GridEmailProcessor.java @@ -157,7 +157,7 @@ public class GridEmailProcessor extends GridEmailProcessorAdapter { } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> schedule(String subj, String body, boolean html) { + @Override public InternalFuture<Boolean> schedule(String subj, String body, boolean html) { String[] addrs = ctx.config().getAdminEmails(); return addrs == null || addrs.length == 0 ? new GridFinishedFuture<>(ctx, false) : @@ -166,7 +166,7 @@ public class GridEmailProcessor extends GridEmailProcessorAdapter { /** {@inheritDoc} */ @SuppressWarnings({"SynchronizeOnNonFinalField"}) - @Override public IgniteFuture<Boolean> schedule(String subj, String body, boolean html, Collection<String> addrs) { + @Override public InternalFuture<Boolean> schedule(String subj, String body, boolean html, Collection<String> addrs) { assert subj != null; assert body != null; assert addrs != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/main/java/org/gridgain/client/hadoop/GridHadoopClientProtocolProvider.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/client/hadoop/GridHadoopClientProtocolProvider.java b/modules/hadoop/src/main/java/org/gridgain/client/hadoop/GridHadoopClientProtocolProvider.java index 4883ce4..1402902 100644 --- a/modules/hadoop/src/main/java/org/gridgain/client/hadoop/GridHadoopClientProtocolProvider.java +++ b/modules/hadoop/src/main/java/org/gridgain/client/hadoop/GridHadoopClientProtocolProvider.java @@ -16,7 +16,6 @@ import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.gridgain.client.*; import org.gridgain.client.marshaller.optimized.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.typedef.*; @@ -34,7 +33,7 @@ import static org.gridgain.client.hadoop.GridHadoopClientProtocol.*; */ public class GridHadoopClientProtocolProvider extends ClientProtocolProvider { /** Clients. */ - private static final ConcurrentHashMap<String, IgniteFuture<GridClient>> cliMap = new ConcurrentHashMap<>(); + private static final ConcurrentHashMap<String, InternalFuture<GridClient>> cliMap = new ConcurrentHashMap<>(); /** {@inheritDoc} */ @Override public ClientProtocol create(Configuration conf) throws IOException { @@ -89,12 +88,12 @@ public class GridHadoopClientProtocolProvider extends ClientProtocolProvider { */ private static GridClient client(String addr) throws IOException { try { - IgniteFuture<GridClient> fut = cliMap.get(addr); + InternalFuture<GridClient> fut = cliMap.get(addr); if (fut == null) { GridFutureAdapter<GridClient> fut0 = new GridFutureAdapter<>(); - IgniteFuture<GridClient> oldFut = cliMap.putIfAbsent(addr, fut0); + InternalFuture<GridClient> oldFut = cliMap.putIfAbsent(addr, fut0); if (oldFut != null) return oldFut.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopIpcIo.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopIpcIo.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopIpcIo.java index c1fcd7f..b730ea4 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopIpcIo.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopIpcIo.java @@ -271,7 +271,7 @@ public class GridGgfsHadoopIpcIo implements GridGgfsHadoopIo { reader = null; } - catch (GridInterruptedException ignored) { + catch (InternalInterruptedException ignored) { Thread.currentThread().interrupt(); log.warn("Got interrupted while waiting for reader thread to shut down (will return)."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopImpl.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopImpl.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopImpl.java index a3504f4..a43067e 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopImpl.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopImpl.java @@ -11,7 +11,6 @@ package org.gridgain.grid.kernal.processors.hadoop; import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; import org.gridgain.grid.util.*; import org.jetbrains.annotations.*; @@ -55,7 +54,7 @@ public class GridHadoopImpl implements GridHadoop { } /** {@inheritDoc} */ - @Override public IgniteFuture<?> submit(GridHadoopJobId jobId, GridHadoopJobInfo jobInfo) { + @Override public InternalFuture<?> submit(GridHadoopJobId jobId, GridHadoopJobInfo jobInfo) { if (busyLock.enterBusy()) { try { return proc.submit(jobId, jobInfo); @@ -97,7 +96,7 @@ public class GridHadoopImpl implements GridHadoop { } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<?> finishFuture(GridHadoopJobId jobId) throws IgniteCheckedException { + @Nullable @Override public InternalFuture<?> finishFuture(GridHadoopJobId jobId) throws IgniteCheckedException { if (busyLock.enterBusy()) { try { return proc.finishFuture(jobId); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopProcessor.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopProcessor.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopProcessor.java index b1ec6db..5d86f11 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopProcessor.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopProcessor.java @@ -11,7 +11,6 @@ package org.gridgain.grid.kernal.processors.hadoop; import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.hadoop.jobtracker.*; @@ -172,7 +171,7 @@ public class GridHadoopProcessor extends GridHadoopProcessorAdapter { } /** {@inheritDoc} */ - @Override public IgniteFuture<?> submit(GridHadoopJobId jobId, GridHadoopJobInfo jobInfo) { + @Override public InternalFuture<?> submit(GridHadoopJobId jobId, GridHadoopJobInfo jobInfo) { return hctx.jobTracker().submit(jobId, jobInfo); } @@ -187,7 +186,7 @@ public class GridHadoopProcessor extends GridHadoopProcessorAdapter { } /** {@inheritDoc} */ - @Override public IgniteFuture<?> finishFuture(GridHadoopJobId jobId) throws IgniteCheckedException { + @Override public InternalFuture<?> finishFuture(GridHadoopJobId jobId) throws IgniteCheckedException { return hctx.jobTracker().finishFuture(jobId); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/jobtracker/GridHadoopJobTracker.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/jobtracker/GridHadoopJobTracker.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/jobtracker/GridHadoopJobTracker.java index c2ee568..84411e1 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/jobtracker/GridHadoopJobTracker.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/jobtracker/GridHadoopJobTracker.java @@ -12,7 +12,6 @@ package org.gridgain.grid.kernal.processors.hadoop.jobtracker; import org.apache.ignite.*; 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.hadoop.*; @@ -67,8 +66,8 @@ public class GridHadoopJobTracker extends GridHadoopComponent { private GridSpinReadWriteLock busyLock; /** Closure to check result of async transform of system cache. */ - private final IgniteInClosure<IgniteFuture<?>> failsLog = new CI1<IgniteFuture<?>>() { - @Override public void apply(IgniteFuture<?> gridFut) { + private final IgniteInClosure<InternalFuture<?>> failsLog = new CI1<InternalFuture<?>>() { + @Override public void apply(InternalFuture<?> gridFut) { try { gridFut.get(); } @@ -194,7 +193,7 @@ public class GridHadoopJobTracker extends GridHadoopComponent { * @return Job completion future. */ @SuppressWarnings("unchecked") - public IgniteFuture<GridHadoopJobId> submit(GridHadoopJobId jobId, GridHadoopJobInfo info) { + public InternalFuture<GridHadoopJobId> submit(GridHadoopJobId jobId, GridHadoopJobInfo info) { if (!busyLock.tryReadLock()) { return new GridFinishedFutureEx<>(new IgniteCheckedException("Failed to execute map-reduce job " + "(grid is stopping): " + info)); @@ -301,7 +300,7 @@ public class GridHadoopJobTracker extends GridHadoopComponent { * @return Finish future or {@code null}. * @throws IgniteCheckedException If failed. */ - @Nullable public IgniteFuture<?> finishFuture(GridHadoopJobId jobId) throws IgniteCheckedException { + @Nullable public InternalFuture<?> finishFuture(GridHadoopJobId jobId) throws IgniteCheckedException { if (!busyLock.tryReadLock()) return null; // Grid is stopping. @@ -993,7 +992,7 @@ public class GridHadoopJobTracker extends GridHadoopComponent { busyLock.readUnlock(); } - IgniteFuture<?> fut = finishFuture(jobId); + InternalFuture<?> fut = finishFuture(jobId); if (fut != null) { try { @@ -1142,8 +1141,8 @@ public class GridHadoopJobTracker extends GridHadoopComponent { return; } - IgniteInClosure<IgniteFuture<?>> cacheUpdater = new CIX1<IgniteFuture<?>>() { - @Override public void applyx(IgniteFuture<?> f) { + IgniteInClosure<InternalFuture<?>> cacheUpdater = new CIX1<InternalFuture<?>>() { + @Override public void applyx(InternalFuture<?> f) { Throwable err = null; if (f != null) { @@ -1192,8 +1191,8 @@ public class GridHadoopJobTracker extends GridHadoopComponent { // Fail the whole job. transform(jobId, new RemoveMappersClosure(prev, currMappers, status.failCause())); else { - ctx.shuffle().flush(jobId).listenAsync(new CIX1<IgniteFuture<?>>() { - @Override public void applyx(IgniteFuture<?> f) { + ctx.shuffle().flush(jobId).listenAsync(new CIX1<InternalFuture<?>>() { + @Override public void applyx(InternalFuture<?> f) { Throwable err = null; if (f != null) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/proto/GridHadoopProtocolJobStatusTask.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/proto/GridHadoopProtocolJobStatusTask.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/proto/GridHadoopProtocolJobStatusTask.java index 497729a..0bbbcea 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/proto/GridHadoopProtocolJobStatusTask.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/proto/GridHadoopProtocolJobStatusTask.java @@ -12,7 +12,6 @@ package org.gridgain.grid.kernal.processors.hadoop.proto; import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; import org.gridgain.grid.util.typedef.*; @@ -47,14 +46,14 @@ public class GridHadoopProtocolJobStatusTask extends GridHadoopProtocolTaskAdapt pollDelay = DFLT_POLL_DELAY; if (pollDelay > 0) { - IgniteFuture<?> fut = hadoop.finishFuture(jobId); + InternalFuture<?> fut = hadoop.finishFuture(jobId); if (fut != null) { if (fut.isDone() || F.eq(jobCtx.getAttribute(ATTR_HELD), true)) return hadoop.status(jobId); else { - fut.listenAsync(new IgniteInClosure<IgniteFuture<?>>() { - @Override public void apply(IgniteFuture<?> fut0) { + fut.listenAsync(new IgniteInClosure<InternalFuture<?>>() { + @Override public void apply(InternalFuture<?> fut0) { jobCtx.callcc(); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffle.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffle.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffle.java index 55e54ad..78d2fe5 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffle.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffle.java @@ -12,7 +12,6 @@ package org.gridgain.grid.kernal.processors.hadoop.shuffle; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.hadoop.*; @@ -227,7 +226,7 @@ public class GridHadoopShuffle extends GridHadoopComponent { * @param jobId Job ID. * @return Future. */ - public IgniteFuture<?> flush(GridHadoopJobId jobId) { + public InternalFuture<?> flush(GridHadoopJobId jobId) { GridHadoopShuffleJob job = jobs.get(jobId); if (job == null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java index 1a8614f..53fa49a 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java @@ -375,8 +375,8 @@ public class GridHadoopShuffleJob<T> implements AutoCloseable { fut.onDone(U.unwrap(e)); } - fut.listenAsync(new IgniteInClosure<IgniteFuture<?>>() { - @Override public void apply(IgniteFuture<?> f) { + fut.listenAsync(new IgniteInClosure<InternalFuture<?>>() { + @Override public void apply(InternalFuture<?> f) { try { f.get(); @@ -403,7 +403,7 @@ public class GridHadoopShuffleJob<T> implements AutoCloseable { snd.join(); } catch (InterruptedException e) { - throw new GridInterruptedException(e); + throw new InternalInterruptedException(e); } } @@ -426,7 +426,7 @@ public class GridHadoopShuffleJob<T> implements AutoCloseable { * @return Future. */ @SuppressWarnings("unchecked") - public IgniteFuture<?> flush() throws IgniteCheckedException { + public InternalFuture<?> flush() throws IgniteCheckedException { if (log.isDebugEnabled()) log.debug("Flushing job " + job.id() + " on address " + locReduceAddr); @@ -452,7 +452,7 @@ public class GridHadoopShuffleJob<T> implements AutoCloseable { log.debug("Finished waiting for sending thread to complete on shuffle job flush: " + job.id()); } catch (InterruptedException e) { - throw new GridInterruptedException(e); + throw new InternalInterruptedException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java index dde9850..ee63d1d 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java @@ -171,7 +171,7 @@ public class GridHadoopExecutorService { workerName = task.toString(); GridWorker w = new GridWorker(gridName, workerName, log, lsnr) { - @Override protected void body() throws InterruptedException, GridInterruptedException { + @Override protected void body() throws InterruptedException, InternalInterruptedException { try { task.call(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java index bb0c65c..4baca1a 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java @@ -12,7 +12,6 @@ package org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external; import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.*; -import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.hadoop.*; @@ -150,8 +149,8 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte "[jobId=" + meta.jobId() + ", meta=" + meta + ']'); } else { - proc.initFut.listenAsync(new CI1<IgniteFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>>>() { - @Override public void apply(IgniteFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>> f) { + proc.initFut.listenAsync(new CI1<InternalFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>>>() { + @Override public void apply(InternalFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>> f) { try { f.get(); @@ -217,9 +216,9 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte final HadoopProcess proc0 = proc; - proc.initFut.listenAsync(new CI1<IgniteFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>>>() { + proc.initFut.listenAsync(new CI1<InternalFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>>>() { @Override public void apply( - IgniteFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>> f) { + InternalFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>> f) { if (!busyLock.tryReadLock()) return; @@ -398,8 +397,8 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte } }, true); - fut.listenAsync(new CI1<IgniteFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>>>() { - @Override public void apply(IgniteFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>> f) { + fut.listenAsync(new CI1<InternalFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>>>() { + @Override public void apply(InternalFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>> f) { try { // Make sure there were no exceptions. f.get(); @@ -783,9 +782,9 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte terminated = true; if (!initFut.isDone()) - initFut.listenAsync(new CI1<IgniteFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>>>() { + initFut.listenAsync(new CI1<InternalFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>>>() { @Override public void apply( - IgniteFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>> f) { + InternalFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>> f) { proc.destroy(); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java index b8da700..f7e3244 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java @@ -11,7 +11,6 @@ package org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.child; import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.message.*; import org.gridgain.grid.kernal.processors.hadoop.shuffle.*; @@ -140,8 +139,8 @@ public class GridHadoopChildProcessRunner { if (!initFut.isDone() && log.isDebugEnabled()) log.debug("Will wait for process initialization future completion: " + req); - initFut.listenAsync(new CI1<IgniteFuture<?>>() { - @Override public void apply(IgniteFuture<?> f) { + initFut.listenAsync(new CI1<InternalFuture<?>>() { + @Override public void apply(InternalFuture<?> f) { try { // Make sure init was successful. f.get(); @@ -212,8 +211,8 @@ public class GridHadoopChildProcessRunner { * @param req Update request. */ private void updateTasks(final GridHadoopJobInfoUpdateRequest req) { - initFut.listenAsync(new CI1<IgniteFuture<?>>() { - @Override public void apply(IgniteFuture<?> gridFut) { + initFut.listenAsync(new CI1<InternalFuture<?>>() { + @Override public void apply(InternalFuture<?> gridFut) { assert initGuard.get(); assert req.jobId().equals(job.id()); @@ -309,8 +308,8 @@ public class GridHadoopChildProcessRunner { final long start = U.currentTimeMillis(); try { - shuffleJob.flush().listenAsync(new CI1<IgniteFuture<?>>() { - @Override public void apply(IgniteFuture<?> f) { + shuffleJob.flush().listenAsync(new CI1<InternalFuture<?>>() { + @Override public void apply(InternalFuture<?> f) { long end = U.currentTimeMillis(); if (log.isDebugEnabled()) @@ -389,8 +388,8 @@ public class GridHadoopChildProcessRunner { if (log.isTraceEnabled()) log.trace("Received shuffle message [desc=" + desc + ", msg=" + msg + ']'); - initFut.listenAsync(new CI1<IgniteFuture<?>>() { - @Override public void apply(IgniteFuture<?> f) { + initFut.listenAsync(new CI1<InternalFuture<?>>() { + @Override public void apply(InternalFuture<?> f) { try { GridHadoopShuffleMessage m = (GridHadoopShuffleMessage)msg; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2CleanupTask.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2CleanupTask.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2CleanupTask.java index f64b48a..13396c7 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2CleanupTask.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2CleanupTask.java @@ -57,7 +57,7 @@ public class GridHadoopV2CleanupTask extends GridHadoopV2Task { catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new InternalInterruptedException(e); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2MapTask.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2MapTask.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2MapTask.java index 5bb4a66..42d489e 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2MapTask.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2MapTask.java @@ -82,7 +82,7 @@ public class GridHadoopV2MapTask extends GridHadoopV2Task { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new InternalInterruptedException(e); } catch (Exception e) { err = e; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2ReduceTask.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2ReduceTask.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2ReduceTask.java index 76942e6..2f9b2a0 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2ReduceTask.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2ReduceTask.java @@ -64,7 +64,7 @@ public class GridHadoopV2ReduceTask extends GridHadoopV2Task { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new InternalInterruptedException(e); } catch (Exception e) { err = e; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2SetupTask.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2SetupTask.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2SetupTask.java index ae52932..943e0d1 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2SetupTask.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2SetupTask.java @@ -51,7 +51,7 @@ public class GridHadoopV2SetupTask extends GridHadoopV2Task { catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new InternalInterruptedException(e); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Splitter.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Splitter.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Splitter.java index 7b201cf..4f478bc 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Splitter.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Splitter.java @@ -65,7 +65,7 @@ public class GridHadoopV2Splitter { catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new InternalInterruptedException(e); } }
