http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java index f985d45..7442d25 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java @@ -159,7 +159,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { final AtomicBoolean finish = new AtomicBoolean(); - IgniteFuture<?> f = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> f = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { try { IgniteUuid msgId = IgniteUuid.randomUuid(); @@ -251,7 +251,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { final AtomicBoolean finish = new AtomicBoolean(); - IgniteFuture<?> f = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> f = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { try { IgniteUuid msgId = IgniteUuid.randomUuid(); @@ -341,7 +341,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { final AtomicBoolean finish = new AtomicBoolean(); final AtomicReference<CountDownLatch> latchRef = new AtomicReference<>(); - IgniteFuture<?> f = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> f = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { while (!finish.get()) { CountDownLatch latch = latchRef.get(); @@ -360,7 +360,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { } }, THREADS, "send-thread"); - IgniteFuture<?> f1 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> f1 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { private long ts = System.currentTimeMillis(); @Override public Object call() throws Exception { @@ -413,7 +413,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { } }, 1, "load-dispatcher"); - IgniteFuture<?> f2 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> 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/d5bef132/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java index 7b86298..b0699f2 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java @@ -21,8 +21,8 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.events.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.lang.*; import org.apache.ignite.internal.processors.cache.query.continuous.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -181,7 +181,7 @@ public class GridContinuousOperationsLoadTest { X.println("Starting " + threadsCnt + " generator thread(s)."); // Start generator threads. - IgniteFuture<Long> genFut = runMultiThreadedAsync(new Callable<Object>() { + IgniteInternalFuture<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/d5bef132/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java index a8d25a7..b988dae 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java @@ -20,6 +20,7 @@ package org.apache.ignite.loadtests.job; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.*; @@ -57,8 +58,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<IgniteInternalFuture<?>> lsnr = new CI1<IgniteInternalFuture<?>>() { + @Override public void apply(IgniteInternalFuture<?> t) { tasksSem.release(); } }; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java index 90267c8..83603ab 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java @@ -20,6 +20,7 @@ package org.apache.ignite.loadtests.job; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -93,7 +94,7 @@ public class GridJobExecutionSingleNodeSemaphoreLoadTest { X.println("Running main test."); - IgniteFuture<Void> collectorFut = GridTestUtils.runAsync(new Callable<Void>() { + IgniteInternalFuture<Void> collectorFut = GridTestUtils.runAsync(new Callable<Void>() { @Override public Void call() throws Exception { GridCumulativeAverage avgTasksPerSec = new GridCumulativeAverage(); @@ -163,8 +164,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<IgniteInternalFuture> lsnr = new CI1<IgniteInternalFuture>() { + @Override public void apply(IgniteInternalFuture t) { sem.release(); } }; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/loadtests/mergesort/GridMergeSortLoadTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/mergesort/GridMergeSortLoadTask.java b/modules/core/src/test/java/org/apache/ignite/loadtests/mergesort/GridMergeSortLoadTask.java index 45dd14f..116dba4 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/mergesort/GridMergeSortLoadTask.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/mergesort/GridMergeSortLoadTask.java @@ -19,7 +19,7 @@ package org.apache.ignite.loadtests.mergesort; import org.apache.ignite.*; import org.apache.ignite.compute.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.resources.*; import org.apache.ignite.internal.util.typedef.*; @@ -77,8 +77,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<IgniteInternalFuture<int[]>>() { + @Override public void apply(IgniteInternalFuture<int[]> fut) { // CONTINUATION: // ============= // Resume suspended job execution. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java index 8a1e825..4ae94b5 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.loadtests.offheap; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cache.affinity.consistenthash.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.internal.util.offheap.*; @@ -168,7 +168,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); @@ -223,7 +223,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); @@ -294,7 +294,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); @@ -349,7 +349,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/GridStreamerIndexLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/GridStreamerIndexLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/GridStreamerIndexLoadTest.java index 7ae1add..d6db0a1 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/GridStreamerIndexLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/GridStreamerIndexLoadTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.loadtests.streamer; import org.apache.ignite.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.streamer.index.*; import org.apache.ignite.streamer.index.hash.*; import org.apache.ignite.streamer.index.tree.*; @@ -114,7 +114,7 @@ public class GridStreamerIndexLoadTest { final AtomicLong enqueueCntr = new AtomicLong(); - IgniteFuture<Long> enqueueFut = runMultiThreadedAsync(new CAX() { + IgniteInternalFuture<Long> enqueueFut = runMultiThreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { Random rnd = new Random(); @@ -128,7 +128,7 @@ public class GridStreamerIndexLoadTest { final AtomicLong evictCntr = new AtomicLong(); - IgniteFuture<Long> evictFut = runMultiThreadedAsync(new CAX() { + IgniteInternalFuture<Long> evictFut = runMultiThreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { while (!Thread.currentThread().isInterrupted()) { win.pollEvicted(); @@ -138,7 +138,7 @@ public class GridStreamerIndexLoadTest { } }, thrCnt, "evictor"); - IgniteFuture<Long> collFut = runMultiThreadedAsync(new CAX() { + IgniteInternalFuture<Long> collFut = runMultiThreadedAsync(new CAX() { @Override public void applyx() { int nSec = 0; long prevEnqueue = enqueueCntr.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java index 0409da5..bd6a75c 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java @@ -120,11 +120,14 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest */ private static StreamerConfiguration streamerConfiguration() { Collection<StreamerStage> stages = F.<StreamerStage>asList(new StreamerStage() { - @Override public String name() { + @Override + public String name() { return "name"; } - @Nullable @Override public Map<String, Collection<?>> run(StreamerContext ctx, Collection evts) { + @Nullable + @Override + public Map<String, Collection<?>> run(StreamerContext ctx, Collection evts) { return null; } }); @@ -132,7 +135,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest StreamerConfiguration cfg = new StreamerConfiguration(); cfg.setAtLeastOnce(true); - cfg.setWindows(F.asList((StreamerWindow)new StreamerUnboundedWindow())); + cfg.setWindows(F.asList((StreamerWindow) new StreamerUnboundedWindow())); cfg.setStages(stages); return cfg; @@ -475,7 +478,8 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest final Ignite ignite = grid(); GridMarshallerTestBean inBean = newTestBean(ignite.cluster().forPredicate(new IgnitePredicate<ClusterNode>() { - @Override public boolean apply(ClusterNode n) { + @Override + public boolean apply(ClusterNode n) { return n.id().equals(ignite.cluster().localNode().id()); } })); @@ -618,7 +622,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest public void testScheduler() throws Exception { IgniteScheduler scheduler = grid().scheduler(); - IgniteFuture<?> fut = scheduler.runLocal(new Runnable() { + IgniteInternalFuture<?> fut = scheduler.runLocal(new Runnable() { @Override public void run() { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java index 528577e..125a438 100644 --- a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.messaging; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.resources.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -1037,7 +1037,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest { Assert.assertNull(id); - IgniteFuture<UUID> fut = msg.future(); + IgniteInternalFuture<UUID> fut = msg.future(); Assert.assertNotNull(fut); @@ -1065,7 +1065,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest { msg.stopRemoteListen(id); - IgniteFuture<?> stopFut = msg.future(); + IgniteInternalFuture<?> stopFut = msg.future(); Assert.assertNotNull(stopFut); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java index a202085..407ba8c 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java @@ -17,7 +17,7 @@ package org.apache.ignite.spi.checkpoint.sharedfs; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.spi.*; @@ -66,7 +66,7 @@ public class GridSharedFsCheckpointSpiMultiThreadedSelfTest extends final AtomicBoolean fail = new AtomicBoolean(); - IgniteFuture fut1 = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture fut1 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { try { @@ -86,7 +86,7 @@ public class GridSharedFsCheckpointSpiMultiThreadedSelfTest extends "writer-1" ); - IgniteFuture fut2 = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture fut2 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { try{ @@ -106,7 +106,7 @@ public class GridSharedFsCheckpointSpiMultiThreadedSelfTest extends "writer-2" ); - IgniteFuture fut3 = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture fut3 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { while (writeFinished.get() < THREAD_CNT * 2) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/spi/collision/GridTestCollisionTaskSession.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/GridTestCollisionTaskSession.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/GridTestCollisionTaskSession.java index 9e97fae..a70b867 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/GridTestCollisionTaskSession.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/GridTestCollisionTaskSession.java @@ -19,6 +19,7 @@ package org.apache.ignite.spi.collision; import org.apache.ignite.*; import org.apache.ignite.compute.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import java.util.*; @@ -197,7 +198,7 @@ public class GridTestCollisionTaskSession implements ComputeTaskSession { } /** {@inheritDoc} */ - @Override public IgniteFuture<?> mapFuture() { + @Override public IgniteInternalFuture<?> mapFuture() { assert false : "Not implemented"; return null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java index a4362af..e35da3e 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.spi.communication.tcp; import org.apache.ignite.*; import org.apache.ignite.cluster.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.communication.*; import org.eclipse.jetty.util.*; @@ -174,7 +175,7 @@ public class GridTcpCommunicationSpiConcurrentConnectSelfTest<T extends Communic final AtomicBoolean stop = new AtomicBoolean(); - IgniteFuture<?> loadFut = null; + IgniteInternalFuture<?> loadFut = null; if (load) { loadFut = GridTestUtils.runMultiThreadedAsync(new Callable<Long>() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanTest.java index 763a14b..bd3bec5 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLanTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.spi.communication.tcp; import mx4j.tools.adaptor.http.*; import org.apache.ignite.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.communication.*; import org.apache.ignite.internal.util.direct.*; @@ -165,7 +166,7 @@ public class GridTcpCommunicationSpiLanTest extends GridSpiAbstractTest<TcpCommu long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Runnable() { @Override public void run() { try { while (cntr.getAndIncrement() < msgCnt) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java index dc9ee56..ac49e45 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.spi.communication.tcp; import org.apache.ignite.*; import org.apache.ignite.cluster.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.communication.*; import org.apache.ignite.internal.util.direct.*; @@ -172,7 +173,7 @@ public abstract class GridTcpCommunicationSpiMultithreadedSelfTest extends GridS long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Runnable() { /** Randomizer. */ private Random rnd = new Random(); @@ -269,7 +270,7 @@ public abstract class GridTcpCommunicationSpiMultithreadedSelfTest extends GridS final int interval = 50; - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Runnable() { /** {@inheritDoc} */ @Override public void run() { try { @@ -308,7 +309,7 @@ public abstract class GridTcpCommunicationSpiMultithreadedSelfTest extends GridS final AtomicBoolean run = new AtomicBoolean(true); - IgniteFuture<?> fut2 = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> fut2 = multithreadedAsync(new Runnable() { @Override public void run() { try { while (run.get() && !Thread.currentThread().isInterrupted()) { @@ -368,7 +369,7 @@ public abstract class GridTcpCommunicationSpiMultithreadedSelfTest extends GridS long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Runnable() { @Override public void run() { try { ClusterNode from = nodes.get(0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java index 6daf7a6..b90242f 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.spi.communication.tcp; import org.apache.ignite.*; import org.apache.ignite.cluster.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.*; import org.apache.ignite.spi.communication.*; @@ -281,7 +282,7 @@ public class GridTcpCommunicationSpiRecoverySelfTest<T extends CommunicationSpi> ses1.pauseReads().get(); - IgniteFuture<?> sndFut = GridTestUtils.runAsync(new Callable<Void>() { + IgniteInternalFuture<?> sndFut = GridTestUtils.runAsync(new Callable<Void>() { @Override public Void call() throws Exception { for (int i = 0; i < 5000; i++) { spi0.sendMessage(node1, new GridTestMessage(node0.id(), msgId.incrementAndGet(), 0)); @@ -391,7 +392,7 @@ public class GridTcpCommunicationSpiRecoverySelfTest<T extends CommunicationSpi> ses1.pauseReads().get(); - IgniteFuture<?> sndFut = GridTestUtils.runAsync(new Callable<Void>() { + IgniteInternalFuture<?> sndFut = GridTestUtils.runAsync(new Callable<Void>() { @Override public Void call() throws Exception { for (int i = 0; i < 5000; i++) { spi0.sendMessage(node1, new GridTestMessage(node0.id(), msgId.incrementAndGet(), 0)); @@ -508,7 +509,7 @@ public class GridTcpCommunicationSpiRecoverySelfTest<T extends CommunicationSpi> ses1.pauseReads().get(); - IgniteFuture<?> sndFut = GridTestUtils.runAsync(new Callable<Void>() { + IgniteInternalFuture<?> sndFut = GridTestUtils.runAsync(new Callable<Void>() { @Override public Void call() throws Exception { for (int i = 0; i < 5000; i++) { spi0.sendMessage(node1, new GridTestMessage(node0.id(), msgId.incrementAndGet(), 0)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java index f4dd773..e81fcba 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java @@ -20,7 +20,6 @@ package org.apache.ignite.spi.discovery.tcp; import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; -import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.internal.util.typedef.*; @@ -154,7 +153,7 @@ public class GridTcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { final AtomicInteger clientIdx = new AtomicInteger(GRID_CNT); - IgniteFuture<?> fut1 = multithreadedAsync( + IgniteInternalFuture<?> fut1 = multithreadedAsync( new Callable<Object>() { @Override public Object call() throws Exception { clientFlagPerThread.set(true); @@ -177,7 +176,7 @@ public class GridTcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { for (int i = 0; i < GRID_CNT; i++) srvIdx.add(i); - IgniteFuture<?> fut2 = multithreadedAsync( + IgniteInternalFuture<?> fut2 = multithreadedAsync( new Callable<Object>() { @Override public Object call() throws Exception { clientFlagPerThread.set(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/spi/swapspace/file/GridFileSwapSpaceSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/file/GridFileSwapSpaceSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/file/GridFileSwapSpaceSpiSelfTest.java index 16cf0ce..378eee4 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/file/GridFileSwapSpaceSpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/file/GridFileSwapSpaceSpiSelfTest.java @@ -17,6 +17,7 @@ package org.apache.ignite.spi.swapspace.file; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.*; import org.apache.ignite.spi.swapspace.*; @@ -57,7 +58,7 @@ public class GridFileSwapSpaceSpiSelfTest extends GridSwapSpaceSpiAbstractSelfTe final AtomicBoolean done = new AtomicBoolean(); - IgniteFuture<?> wFut = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> wFut = multithreadedAsync(new Callable<Object>() { @Nullable @Override public Object call() throws Exception { while (!done.get()) { long val = valCntr.incrementAndGet(); @@ -74,7 +75,7 @@ public class GridFileSwapSpaceSpiSelfTest extends GridSwapSpaceSpiAbstractSelfTe wLatch.await(); - IgniteFuture<?> rFut = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> rFut = multithreadedAsync(new Callable<Object>() { @Nullable @Override public Object call() throws Exception { while (valCntr.get() < 1000) { byte[] val = spi.read(null, key, context()); @@ -139,7 +140,7 @@ public class GridFileSwapSpaceSpiSelfTest extends GridSwapSpaceSpiAbstractSelfTe final AtomicBoolean fin = new AtomicBoolean(); - final IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + final IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesTest.java b/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesTest.java index f70ea1b..f8c7fc6 100644 --- a/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.storevalbytes; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -201,8 +202,8 @@ public class GridCacheStoreValueBytesTest { final Semaphore sem = new Semaphore(concurrentGetNum); - final IgniteInClosure<IgniteFuture> lsnr = new CI1<IgniteFuture>() { - @Override public void apply(IgniteFuture t) { + final IgniteInClosure<IgniteInternalFuture> lsnr = new CI1<IgniteInternalFuture>() { + @Override public void apply(IgniteInternalFuture t) { sem.release(); } }; @@ -231,7 +232,7 @@ public class GridCacheStoreValueBytesTest { if (keys.size() == getKeyNum) { sem.acquire(); - IgniteFuture<Map<Integer, String>> f = cache.getAllAsync(keys); + IgniteInternalFuture<Map<Integer, String>> f = cache.getAllAsync(keys); f.listenAsync(lsnr); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/streamer/index/GridStreamerIndexSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/streamer/index/GridStreamerIndexSelfTest.java b/modules/core/src/test/java/org/apache/ignite/streamer/index/GridStreamerIndexSelfTest.java index e7692f0..aed1e33 100644 --- a/modules/core/src/test/java/org/apache/ignite/streamer/index/GridStreamerIndexSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/streamer/index/GridStreamerIndexSelfTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.streamer.index; import org.apache.ignite.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.streamer.index.hash.*; import org.apache.ignite.streamer.index.tree.*; import org.apache.ignite.streamer.window.*; @@ -296,7 +296,7 @@ public class GridStreamerIndexSelfTest extends GridCommonAbstractTest { win.start(); - IgniteFuture<Long> pollFut = null; + IgniteInternalFuture<Long> pollFut = null; if (pollEvicted) { // These threads poll evicted events from the window if it doesn't break @@ -331,7 +331,7 @@ public class GridStreamerIndexSelfTest extends GridCommonAbstractTest { // if it is still present in the window. In the tested index events are // sorted by value and the value is a number of repeated events, so, this // should be invariant. - IgniteFuture<Long> fut1 = runMultiThreadedAsync(new CAX() { + IgniteInternalFuture<Long> fut1 = runMultiThreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { final String evt = Thread.currentThread().getName(); int cntr = 1; @@ -358,7 +358,7 @@ public class GridStreamerIndexSelfTest extends GridCommonAbstractTest { }, threadCnt / 2, "test-multi"); // This thread generates a set of single non-repeating events from 0 to iters. - IgniteFuture<Long> fut2 = runMultiThreadedAsync(new CAX() { + IgniteInternalFuture<Long> fut2 = runMultiThreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { for (int i = 0; i < iters && !Thread.currentThread().isInterrupted(); i++) win.enqueue(String.valueOf(i)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/streamer/window/GridStreamerWindowSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/streamer/window/GridStreamerWindowSelfTest.java b/modules/core/src/test/java/org/apache/ignite/streamer/window/GridStreamerWindowSelfTest.java index cd164bb..2aca81c 100644 --- a/modules/core/src/test/java/org/apache/ignite/streamer/window/GridStreamerWindowSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/streamer/window/GridStreamerWindowSelfTest.java @@ -18,8 +18,8 @@ package org.apache.ignite.streamer.window; import org.apache.ignite.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.*; -import org.apache.ignite.lang.*; import org.apache.ignite.streamer.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -792,7 +792,7 @@ public class GridStreamerWindowSelfTest extends GridCommonAbstractTest { final AtomicInteger added = new GridAtomicInteger(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index 2bce759..433034d 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@ -455,7 +455,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 IgniteInternalFuture<Long> runMultiThreadedAsync(Runnable run, int threadNum, String threadName) { return runMultiThreadedAsync(makeCallable(run, null), threadNum, threadName); } @@ -483,7 +483,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 IgniteInternalFuture<Long> runMultiThreadedAsync(Callable<?> call, int threadNum, final String threadName) { final List<Callable<?>> calls = Collections.<Callable<?>>nCopies(threadNum, call); final GridTestSafeThreadFactory threadFactory = new GridTestSafeThreadFactory(threadName); @@ -503,7 +503,7 @@ public final class GridTestUtils { }; // Async execution future (doesn't support cancel()). - IgniteFuture<Long> runFut = runAsync(new Callable<Long>() { + IgniteInternalFuture<Long> runFut = runAsync(new Callable<Long>() { @Override public Long call() throws Exception { return runMultiThreaded(calls, threadFactory); } @@ -581,7 +581,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> IgniteInternalFuture<T> runAsync(final Callable<T> task) { if (!busyLock.enterBusy()) throw new IllegalStateException("Failed to start new threads (test is being stopped)."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index 4153c61..4a4ca95 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -297,7 +297,7 @@ public abstract class GridAbstractTest extends TestCase { * @throws Exception If failed. * @return Future. */ - protected IgniteFuture<?> multithreadedAsync(Runnable r, int threadNum) throws Exception { + protected IgniteInternalFuture<?> multithreadedAsync(Runnable r, int threadNum) throws Exception { return multithreadedAsync(r, threadNum, getTestGridName()); } @@ -312,7 +312,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 IgniteInternalFuture<?> multithreadedAsync(Runnable r, int threadNum, String threadName) throws Exception { return GridTestUtils.runMultiThreadedAsync(r, threadNum, threadName); } @@ -350,7 +350,7 @@ public abstract class GridAbstractTest extends TestCase { * @throws Exception If failed. * @return Future. */ - protected IgniteFuture<?> multithreadedAsync(Callable<?> c, int threadNum) throws Exception { + protected IgniteInternalFuture<?> multithreadedAsync(Callable<?> c, int threadNum) throws Exception { return multithreadedAsync(c, threadNum, getTestGridName()); } @@ -364,7 +364,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 IgniteInternalFuture<?> 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/d5bef132/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java index bb9e502..b891646 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.testframework.junits.cache; import org.apache.ignite.*; import org.apache.ignite.cache.store.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; @@ -551,7 +552,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object } /** {@inheritDoc} */ - @Override public <R> IgniteFuture<R> future() { + @Override public <R> IgniteInternalFuture<R> future() { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java index c8f3d78..b5d7c94 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java @@ -611,7 +611,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> IgniteInternalFuture<T> waitForLocalEvent(IgniteEvents evts, @Nullable IgnitePredicate<T> filter, @Nullable int... types) throws IgniteCheckedException { evts = evts.withAsync(); @@ -619,7 +619,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { assertNull(evts.waitForLocal(filter, types)); - IgniteFuture<T> fut = evts.future(); + IgniteInternalFuture<T> fut = evts.future(); assertNotNull(fut); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/util/GridConcurrentLinkedDequeMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridConcurrentLinkedDequeMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridConcurrentLinkedDequeMultiThreadedTest.java index ee32891..5422445 100644 --- a/modules/core/src/test/java/org/apache/ignite/util/GridConcurrentLinkedDequeMultiThreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/util/GridConcurrentLinkedDequeMultiThreadedTest.java @@ -17,7 +17,7 @@ package org.apache.ignite.util; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.jdk8.backport.*; import org.jdk8.backport.ConcurrentLinkedDeque8.*; import org.apache.ignite.testframework.junits.common.*; @@ -44,7 +44,7 @@ public class GridConcurrentLinkedDequeMultiThreadedTest extends GridCommonAbstra final ConcurrentLinkedDeque8<Byte> queue = new ConcurrentLinkedDeque8<>(); // Poll thread. - IgniteFuture<?> pollFut = multithreadedAsync( + IgniteInternalFuture<?> pollFut = multithreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { info("Thread started."); @@ -69,7 +69,7 @@ public class GridConcurrentLinkedDequeMultiThreadedTest extends GridCommonAbstra ); // Producer thread. - IgniteFuture<?> prodFut = multithreadedAsync( + IgniteInternalFuture<?> prodFut = multithreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { info("Thread started."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/util/GridConcurrentLinkedHashMapMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridConcurrentLinkedHashMapMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridConcurrentLinkedHashMapMultiThreadedSelfTest.java index fb896ae..7d68b07 100644 --- a/modules/core/src/test/java/org/apache/ignite/util/GridConcurrentLinkedHashMapMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/util/GridConcurrentLinkedHashMapMultiThreadedSelfTest.java @@ -17,7 +17,7 @@ package org.apache.ignite.util; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.junits.common.*; import org.jdk8.backport.*; @@ -269,7 +269,7 @@ public class GridConcurrentLinkedHashMapMultiThreadedSelfTest extends GridCommon final ConcurrentHashMap<String, LinkedList<Integer>> res = new ConcurrentHashMap<>(); // Producer thread. - IgniteFuture<?> fut = multithreadedAsync( + IgniteInternalFuture<?> fut = multithreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { String thNm = Thread.currentThread().getName(); @@ -331,7 +331,7 @@ public class GridConcurrentLinkedHashMapMultiThreadedSelfTest extends GridCommon long start = System.currentTimeMillis(); // Updater threads. - IgniteFuture<?> fut = multithreadedAsync( + IgniteInternalFuture<?> fut = multithreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { Random rnd = new Random(); @@ -416,7 +416,7 @@ public class GridConcurrentLinkedHashMapMultiThreadedSelfTest extends GridCommon long start = System.currentTimeMillis(); // Updater threads. - IgniteFuture<?> fut = multithreadedAsync( + IgniteInternalFuture<?> fut = multithreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { Random rnd = new Random(); @@ -490,7 +490,7 @@ public class GridConcurrentLinkedHashMapMultiThreadedSelfTest extends GridCommon long start = System.currentTimeMillis(); // Updater threads. - IgniteFuture<?> fut = multithreadedAsync( + IgniteInternalFuture<?> fut = multithreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { Random rnd = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/util/GridIndexFillTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridIndexFillTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridIndexFillTest.java index e5e0a44..bd00326 100644 --- a/modules/core/src/test/java/org/apache/ignite/util/GridIndexFillTest.java +++ b/modules/core/src/test/java/org/apache/ignite/util/GridIndexFillTest.java @@ -17,8 +17,8 @@ package org.apache.ignite.util; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.*; -import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.snaptree.*; import org.apache.ignite.testframework.junits.common.*; @@ -116,7 +116,7 @@ public class GridIndexFillTest extends GridCommonAbstractTest { public void testSnaptreeParallelBuild() throws Exception { final AtomicBoolean stop = new AtomicBoolean(); - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { ThreadLocalRandom rnd = ThreadLocalRandom.current(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/util/GridSnapshotLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridSnapshotLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridSnapshotLockSelfTest.java index cb4ac26..dd9a17a 100644 --- a/modules/core/src/test/java/org/apache/ignite/util/GridSnapshotLockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/util/GridSnapshotLockSelfTest.java @@ -18,8 +18,8 @@ package org.apache.ignite.util; import org.apache.ignite.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.*; -import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.testframework.junits.common.*; @@ -54,7 +54,7 @@ public class GridSnapshotLockSelfTest extends GridCommonAbstractTest { } }; - IgniteFuture<?> fut1 = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> fut1 = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); @@ -82,7 +82,7 @@ public class GridSnapshotLockSelfTest extends GridCommonAbstractTest { } }, 15, "update"); - IgniteFuture<?> fut2 = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> fut2 = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { while(!stop.get()) { T3<Long, Long, Long> t; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/util/GridSpinReadWriteLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridSpinReadWriteLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridSpinReadWriteLockSelfTest.java index 6c16ddd..18df558 100644 --- a/modules/core/src/test/java/org/apache/ignite/util/GridSpinReadWriteLockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/util/GridSpinReadWriteLockSelfTest.java @@ -17,8 +17,8 @@ package org.apache.ignite.util; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.*; -import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.junits.common.*; @@ -58,7 +58,7 @@ public class GridSpinReadWriteLockSelfTest extends GridCommonAbstractTest { final CountDownLatch latch = new CountDownLatch(1); - IgniteFuture<?> f = multithreadedAsync( + IgniteInternalFuture<?> f = multithreadedAsync( new Callable<Object>() { @Override public Object call() throws Exception { assert !lock.tryWriteLock(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/email/src/main/java/org/apache/ignite/internal/processors/email/IgniteEmailProcessor.java ---------------------------------------------------------------------- diff --git a/modules/email/src/main/java/org/apache/ignite/internal/processors/email/IgniteEmailProcessor.java b/modules/email/src/main/java/org/apache/ignite/internal/processors/email/IgniteEmailProcessor.java index 0fa56cc..57acecb 100644 --- a/modules/email/src/main/java/org/apache/ignite/internal/processors/email/IgniteEmailProcessor.java +++ b/modules/email/src/main/java/org/apache/ignite/internal/processors/email/IgniteEmailProcessor.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.email; import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; -import org.apache.ignite.lang.*; import org.apache.ignite.thread.*; import org.apache.ignite.internal.util.future.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -165,7 +164,7 @@ public class IgniteEmailProcessor extends IgniteEmailProcessorAdapter { } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> schedule(String subj, String body, boolean html) { + @Override public IgniteInternalFuture<Boolean> schedule(String subj, String body, boolean html) { String[] addrs = ctx.config().getAdminEmails(); return addrs == null || addrs.length == 0 ? new GridFinishedFuture<>(ctx, false) : @@ -174,7 +173,7 @@ public class IgniteEmailProcessor extends IgniteEmailProcessorAdapter { /** {@inheritDoc} */ @SuppressWarnings({"SynchronizeOnNonFinalField"}) - @Override public IgniteFuture<Boolean> schedule(String subj, String body, boolean html, Collection<String> addrs) { + @Override public IgniteInternalFuture<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/d5bef132/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolProvider.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolProvider.java b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolProvider.java index 5be8d5f..29967c7 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolProvider.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolProvider.java @@ -21,7 +21,7 @@ import org.apache.hadoop.conf.*; import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.mapreduce.protocol.*; import org.apache.ignite.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.client.*; import org.apache.ignite.client.marshaller.optimized.*; import org.apache.ignite.internal.util.future.*; @@ -41,7 +41,7 @@ import static org.apache.ignite.client.hadoop.GridHadoopClientProtocol.*; */ public class GridHadoopClientProtocolProvider extends ClientProtocolProvider { /** Clients. */ - private static final ConcurrentHashMap<String, IgniteFuture<GridClient>> cliMap = new ConcurrentHashMap<>(); + private static final ConcurrentHashMap<String, IgniteInternalFuture<GridClient>> cliMap = new ConcurrentHashMap<>(); /** {@inheritDoc} */ @Override public ClientProtocol create(Configuration conf) throws IOException { @@ -96,12 +96,12 @@ public class GridHadoopClientProtocolProvider extends ClientProtocolProvider { */ private static GridClient client(String addr) throws IOException { try { - IgniteFuture<GridClient> fut = cliMap.get(addr); + IgniteInternalFuture<GridClient> fut = cliMap.get(addr); if (fut == null) { GridFutureAdapter<GridClient> fut0 = new GridFutureAdapter<>(); - IgniteFuture<GridClient> oldFut = cliMap.putIfAbsent(addr, fut0); + IgniteInternalFuture<GridClient> oldFut = cliMap.putIfAbsent(addr, fut0); if (oldFut != null) return oldFut.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopImpl.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopImpl.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopImpl.java index 8c48f5e..79f099d 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopImpl.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopImpl.java @@ -18,8 +18,8 @@ package org.apache.ignite.internal.processors.hadoop; import org.apache.ignite.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.*; -import org.apache.ignite.lang.*; import org.apache.ignite.hadoop.*; import org.jetbrains.annotations.*; @@ -62,7 +62,7 @@ public class GridHadoopImpl implements GridHadoop { } /** {@inheritDoc} */ - @Override public IgniteFuture<?> submit(GridHadoopJobId jobId, GridHadoopJobInfo jobInfo) { + @Override public IgniteInternalFuture<?> submit(GridHadoopJobId jobId, GridHadoopJobInfo jobInfo) { if (busyLock.enterBusy()) { try { return proc.submit(jobId, jobInfo); @@ -104,7 +104,7 @@ public class GridHadoopImpl implements GridHadoop { } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<?> finishFuture(GridHadoopJobId jobId) throws IgniteCheckedException { + @Nullable @Override public IgniteInternalFuture<?> finishFuture(GridHadoopJobId jobId) throws IgniteCheckedException { if (busyLock.enterBusy()) { try { return proc.finishFuture(jobId); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopProcessor.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopProcessor.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopProcessor.java index cd5027e..c0c8e23 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopProcessor.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopProcessor.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.hadoop; import org.apache.ignite.*; import org.apache.ignite.internal.*; -import org.apache.ignite.lang.*; import org.apache.ignite.hadoop.*; import org.apache.ignite.internal.processors.hadoop.jobtracker.*; import org.apache.ignite.internal.processors.hadoop.planner.*; @@ -179,7 +178,7 @@ public class IgniteHadoopProcessor extends IgniteHadoopProcessorAdapter { } /** {@inheritDoc} */ - @Override public IgniteFuture<?> submit(GridHadoopJobId jobId, GridHadoopJobInfo jobInfo) { + @Override public IgniteInternalFuture<?> submit(GridHadoopJobId jobId, GridHadoopJobInfo jobInfo) { return hctx.jobTracker().submit(jobId, jobInfo); } @@ -194,7 +193,7 @@ public class IgniteHadoopProcessor extends IgniteHadoopProcessorAdapter { } /** {@inheritDoc} */ - @Override public IgniteFuture<?> finishFuture(GridHadoopJobId jobId) throws IgniteCheckedException { + @Override public IgniteInternalFuture<?> finishFuture(GridHadoopJobId jobId) throws IgniteCheckedException { return hctx.jobTracker().finishFuture(jobId); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java index 0711ebd..6e35f47 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java @@ -21,6 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.events.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.lang.*; @@ -82,8 +83,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<IgniteInternalFuture<?>> failsLog = new CI1<IgniteInternalFuture<?>>() { + @Override public void apply(IgniteInternalFuture<?> gridFut) { try { gridFut.get(); } @@ -237,7 +238,7 @@ public class GridHadoopJobTracker extends GridHadoopComponent { * @return Job completion future. */ @SuppressWarnings("unchecked") - public IgniteFuture<GridHadoopJobId> submit(GridHadoopJobId jobId, GridHadoopJobInfo info) { + public IgniteInternalFuture<GridHadoopJobId> submit(GridHadoopJobId jobId, GridHadoopJobInfo info) { if (!busyLock.tryReadLock()) { return new GridFinishedFutureEx<>(new IgniteCheckedException("Failed to execute map-reduce job " + "(grid is stopping): " + info)); @@ -344,7 +345,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 IgniteInternalFuture<?> finishFuture(GridHadoopJobId jobId) throws IgniteCheckedException { if (!busyLock.tryReadLock()) return null; // Grid is stopping. @@ -1038,7 +1039,7 @@ public class GridHadoopJobTracker extends GridHadoopComponent { busyLock.readUnlock(); } - IgniteFuture<?> fut = finishFuture(jobId); + IgniteInternalFuture<?> fut = finishFuture(jobId); if (fut != null) { try { @@ -1187,8 +1188,8 @@ public class GridHadoopJobTracker extends GridHadoopComponent { return; } - IgniteInClosure<IgniteFuture<?>> cacheUpdater = new CIX1<IgniteFuture<?>>() { - @Override public void applyx(IgniteFuture<?> f) { + IgniteInClosure<IgniteInternalFuture<?>> cacheUpdater = new CIX1<IgniteInternalFuture<?>>() { + @Override public void applyx(IgniteInternalFuture<?> f) { Throwable err = null; if (f != null) { @@ -1237,8 +1238,8 @@ public class GridHadoopJobTracker extends GridHadoopComponent { // Fail the whole job. transform(jobId, new RemoveMappersProcessor(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<IgniteInternalFuture<?>>() { + @Override public void applyx(IgniteInternalFuture<?> f) { Throwable err = null; if (f != null) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolJobStatusTask.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolJobStatusTask.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolJobStatusTask.java index f4f4da8..19adf3b 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolJobStatusTask.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolJobStatusTask.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.hadoop.proto; import org.apache.ignite.*; import org.apache.ignite.compute.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.hadoop.*; import org.apache.ignite.internal.util.typedef.*; @@ -54,14 +55,14 @@ public class GridHadoopProtocolJobStatusTask extends GridHadoopProtocolTaskAdapt pollDelay = DFLT_POLL_DELAY; if (pollDelay > 0) { - IgniteFuture<?> fut = hadoop.finishFuture(jobId); + IgniteInternalFuture<?> 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<IgniteInternalFuture<?>>() { + @Override public void apply(IgniteInternalFuture<?> fut0) { jobCtx.callcc(); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffle.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffle.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffle.java index 087ae88..c186953 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffle.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffle.java @@ -234,7 +234,7 @@ public class GridHadoopShuffle extends GridHadoopComponent { * @param jobId Job ID. * @return Future. */ - public IgniteFuture<?> flush(GridHadoopJobId jobId) { + public IgniteInternalFuture<?> flush(GridHadoopJobId jobId) { GridHadoopShuffleJob job = jobs.get(jobId); if (job == null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffleJob.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffleJob.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffleJob.java index 2055941..54ef6c7 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffleJob.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffleJob.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.hadoop.shuffle; import org.apache.ignite.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.thread.*; import org.apache.ignite.hadoop.*; @@ -382,8 +383,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<IgniteInternalFuture<?>>() { + @Override public void apply(IgniteInternalFuture<?> f) { try { f.get(); @@ -433,7 +434,7 @@ public class GridHadoopShuffleJob<T> implements AutoCloseable { * @return Future. */ @SuppressWarnings("unchecked") - public IgniteFuture<?> flush() throws IgniteCheckedException { + public IgniteInternalFuture<?> flush() throws IgniteCheckedException { if (log.isDebugEnabled()) log.debug("Flushing job " + job.id() + " on address " + locReduceAddr); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java index f7035ad..d1c4bf0 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java @@ -157,8 +157,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<IgniteInternalFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>>>() { + @Override public void apply(IgniteInternalFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>> f) { try { f.get(); @@ -224,9 +224,9 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte final HadoopProcess proc0 = proc; - proc.initFut.listenAsync(new CI1<IgniteFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>>>() { + proc.initFut.listenAsync(new CI1<IgniteInternalFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>>>() { @Override public void apply( - IgniteFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>> f) { + IgniteInternalFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>> f) { if (!busyLock.tryReadLock()) return; @@ -405,8 +405,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<IgniteInternalFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>>>() { + @Override public void apply(IgniteInternalFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>> f) { try { // Make sure there were no exceptions. f.get(); @@ -790,9 +790,9 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte terminated = true; if (!initFut.isDone()) - initFut.listenAsync(new CI1<IgniteFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>>>() { + initFut.listenAsync(new CI1<IgniteInternalFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>>>() { @Override public void apply( - IgniteFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>> f) { + IgniteInternalFuture<IgniteBiTuple<Process, GridHadoopProcessDescriptor>> f) { proc.destroy(); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java index 2c2f59d..4408b9a 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.hadoop.taskexecutor.external.child; import org.apache.ignite.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.hadoop.*; import org.apache.ignite.internal.processors.hadoop.message.*; import org.apache.ignite.internal.processors.hadoop.shuffle.*; @@ -147,8 +147,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<IgniteInternalFuture<?>>() { + @Override public void apply(IgniteInternalFuture<?> f) { try { // Make sure init was successful. f.get(); @@ -219,8 +219,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<IgniteInternalFuture<?>>() { + @Override public void apply(IgniteInternalFuture<?> gridFut) { assert initGuard.get(); assert req.jobId().equals(job.id()); @@ -316,8 +316,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<IgniteInternalFuture<?>>() { + @Override public void apply(IgniteInternalFuture<?> f) { long end = U.currentTimeMillis(); if (log.isDebugEnabled()) @@ -396,8 +396,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<IgniteInternalFuture<?>>() { + @Override public void apply(IgniteInternalFuture<?> f) { try { GridHadoopShuffleMessage m = (GridHadoopShuffleMessage)msg; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java index 390e630..5688500 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java @@ -734,7 +734,7 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** {@inheritDoc} */ - @Override public IgniteFuture<?> awaitDeletesAsync() throws IgniteCheckedException { + @Override public IgniteInternalFuture<?> awaitDeletesAsync() throws IgniteCheckedException { return null; } @@ -921,7 +921,7 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** {@inheritDoc} */ - @Override public <R> IgniteFuture<R> future() { + @Override public <R> IgniteInternalFuture<R> future() { return null; } } @@ -1001,7 +1001,7 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> sendAdminEmailAsync(String subj, String body, boolean html) { + @Override public IgniteInternalFuture<Boolean> sendAdminEmailAsync(String subj, String body, boolean html) { return null; } @@ -1215,7 +1215,7 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** {@inheritDoc} */ - @Override public <R> IgniteFuture<R> future() { + @Override public <R> IgniteInternalFuture<R> future() { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobTrackerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobTrackerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobTrackerSelfTest.java index 1c44282..85f55d8 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobTrackerSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobTrackerSelfTest.java @@ -22,7 +22,6 @@ import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.mapreduce.lib.input.FileSplit; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.apache.ignite.internal.*; -import org.apache.ignite.lang.*; import org.apache.ignite.hadoop.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -225,7 +224,7 @@ public class GridHadoopJobTrackerSelfTest extends GridHadoopAbstractSelfTest { assert stat != null; - IgniteFuture<?> fut = hadoop.finishFuture(jobId); + IgniteInternalFuture<?> fut = hadoop.finishFuture(jobId); if (!complete) assertFalse(fut.isDone()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceEmbeddedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceEmbeddedSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceEmbeddedSelfTest.java index 7dc1cfe..4d8d610 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceEmbeddedSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceEmbeddedSelfTest.java @@ -26,7 +26,7 @@ import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.mapreduce.lib.input.FileInputFormat; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.apache.ignite.fs.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.hadoop.*; import org.apache.ignite.internal.processors.hadoop.examples.*; @@ -117,7 +117,7 @@ public class GridHadoopMapReduceEmbeddedSelfTest extends GridHadoopMapReduceTest job.setJarByClass(GridHadoopWordCount2.class); - IgniteFuture<?> fut = grid(0).hadoop().submit(new GridHadoopJobId(UUID.randomUUID(), 1), + IgniteInternalFuture<?> fut = grid(0).hadoop().submit(new GridHadoopJobId(UUID.randomUUID(), 1), createJobInfo(job.getConfiguration())); fut.get();
