Repository: ignite Updated Branches: refs/heads/master 906b69268 -> 282b334f7
http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java index 75e7d22..03e7210 100644 --- a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java +++ b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java @@ -83,7 +83,7 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme Assert.assertEquals(Thread.currentThread(), thread); Assert.assertEquals(msgStr, msg); } - }); + }, false); } /** @@ -94,12 +94,12 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme public void testSendAsyncMode() throws Exception { Ignite ignite1 = startGrid(1); - send(ignite1.message().withAsync(), msgStr, new IgniteBiInClosure<String, Thread> () { + send(ignite1.message(), msgStr, new IgniteBiInClosure<String, Thread> () { @Override public void apply(String msg, Thread thread) { Assert.assertTrue(!Thread.currentThread().equals(thread)); Assert.assertEquals(msgStr, msg); } - }); + }, true); } /** @@ -116,7 +116,7 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme Assert.assertEquals(Thread.currentThread(), thread); Assert.assertEquals(msgStr, msg); } - }); + }, false); } /** @@ -128,12 +128,12 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme Ignite ignite1 = startGrid(1); Ignite ignite2 = startGrid(2); - sendWith2Nodes(ignite2, ignite1.message().withAsync(), msgStr, new IgniteBiInClosure<String, Thread> () { + sendWith2Nodes(ignite2, ignite1.message(), msgStr, new IgniteBiInClosure<String, Thread> () { @Override public void apply(String msg, Thread thread) { Assert.assertTrue(!Thread.currentThread().equals(thread)); Assert.assertEquals(msgStr, msg); } - }); + }, true); } /** @@ -155,24 +155,6 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme } /** - * Checks that sendOrdered work in thread pool, 1 node in topology. - * - * @throws Exception If failed. - */ - public void testSendOrderedAsyncMode() throws Exception { - Ignite ignite1 = startGrid(1); - - final List<String> msgs = orderedMessages(); - - sendOrdered(ignite1.message().withAsync(), msgs, new IgniteBiInClosure< List<String>, List<Thread>> () { - @Override public void apply(List<String> received, List<Thread> threads) { - assertFalse(threads.contains(Thread.currentThread())); - assertTrue(msgs.equals(received)); - } - }); - } - - /** * Checks that sendOrdered work in thread pool, 2 nodes in topology. * * @throws Exception If failed. @@ -192,25 +174,6 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme } /** - * Checks that sendOrdered work in thread pool, 2 nodes in topology. - * - * @throws Exception If failed. - */ - public void testSendOrderedAsyncMode2Node() throws Exception { - Ignite ignite1 = startGrid(1); - Ignite ignite2 = startGrid(2); - - final List<String> msgs = orderedMessages(); - - sendOrderedWith2Node(ignite2, ignite1.message().withAsync(), msgs, new IgniteBiInClosure<List<String>, List<Thread>>() { - @Override public void apply(List<String> received, List<Thread> threads) { - assertFalse(threads.contains(Thread.currentThread())); - assertTrue(msgs.equals(received)); - } - }); - } - - /** * @throws Exception If failed. */ public void testSendOrderedDefaultModeMultiThreads() throws Exception { @@ -222,15 +185,6 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme /** * @throws Exception If failed. */ - public void testSendOrderedAsyncModeMultiThreads() throws Exception { - Ignite ignite = startGrid(1); - - sendOrderedMultiThreads(ignite.message().withAsync()); - } - - /** - * @throws Exception If failed. - */ public void testSendOrderedDefaultModeMultiThreadsWith2Node() throws Exception { Ignite ignite1 = startGrid(1); Ignite ignite2 = startGrid(2); @@ -239,16 +193,6 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme } /** - * @throws Exception If failed. - */ - public void testSendOrderedAsyncModeMultiThreadsWith2Node() throws Exception { - Ignite ignite1 = startGrid(1); - Ignite ignite2 = startGrid(2); - - sendOrderedMultiThreadsWith2Node(ignite2, ignite1.message().withAsync()); - } - - /** * @param ignite2 Second node. * @param ignMsg IgniteMessage. * @throws Exception If failed. @@ -380,13 +324,15 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme * @param igniteMsg Ignite message. * @param msgStr Message string. * @param cls Callback for compare result. + * @param async Use sendAsync flag. * @throws Exception If failed. */ private void sendWith2Nodes( final Ignite ignite2, final IgniteMessaging igniteMsg, final String msgStr, - final IgniteBiInClosure<String, Thread> cls + final IgniteBiInClosure<String, Thread> cls, + final boolean async ) throws Exception { final CountDownLatch latch = new CountDownLatch(1); @@ -400,7 +346,7 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme } }); - send(igniteMsg, msgStr, cls); + send(igniteMsg, msgStr, cls, async); latch.await(); } @@ -409,12 +355,14 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme * @param igniteMsg Ignite messaging. * @param msgStr Message string. * @param cls Callback for compare result. + * @param async Use sendAsync flag. * @throws Exception If failed. */ private void send( final IgniteMessaging igniteMsg, final String msgStr, - final IgniteBiInClosure<String, Thread> cls + final IgniteBiInClosure<String, Thread> cls, + final boolean async ) throws Exception { final CountDownLatch latch = new CountDownLatch(1); @@ -433,7 +381,10 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme } }); - igniteMsg.send(TOPIC, msgStr); + if (async) + igniteMsg.withAsync().send(TOPIC, msgStr); + else + igniteMsg.send(TOPIC, msgStr); latch.await(); http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java index 36c3027..bc601db 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java @@ -25,7 +25,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.ignite.Ignite; -import org.apache.ignite.IgniteCompute; import org.apache.ignite.IgniteLogger; import org.apache.ignite.compute.ComputeJob; import org.apache.ignite.compute.ComputeJobAdapter; @@ -122,11 +121,7 @@ public class GridSessionFutureWaitJobAttributeSelfTest extends GridCommonAbstrac private void checkTask(int num) throws InterruptedException { Ignite ignite = G.ignite(getTestIgniteInstanceName()); - IgniteCompute comp = ignite.compute().withAsync(); - - comp.execute(GridTaskSessionTestTask.class.getName(), num); - - ComputeTaskFuture<?> fut = comp.future(); + ComputeTaskFuture<?> fut = ignite.compute().executeAsync(GridTaskSessionTestTask.class.getName(), num); assert fut != null; http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeOrderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeOrderSelfTest.java index 7711733..0c28e7e 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeOrderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeOrderSelfTest.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import java.util.UUID; import org.apache.ignite.Ignite; -import org.apache.ignite.IgniteCompute; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.cluster.ClusterNode; @@ -63,12 +62,9 @@ public class GridSessionSetJobAttributeOrderSelfTest extends GridCommonAbstractT ignite1.compute().localDeployTask(SessionTestTask.class, SessionTestTask.class.getClassLoader()); - IgniteCompute comp = ignite1.compute().withAsync(); - for (int i = 0; i < TESTS_COUNT; i++) { - comp.withTimeout(100000).execute(SessionTestTask.class.getName(), ignite2.cluster().localNode().id()); - - ComputeTaskFuture<?> fut = comp.future(); + ComputeTaskFuture<?> fut = ignite1.compute().withTimeout(100000).executeAsync( + SessionTestTask.class.getName(), ignite2.cluster().localNode().id()); fut.getTaskSession().setAttribute(TEST_ATTR_KEY, SETS_ATTR_COUNT); http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java index 6cf642b..5c7e6ec 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java @@ -26,7 +26,6 @@ import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.apache.ignite.Ignite; -import org.apache.ignite.IgniteCompute; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.compute.ComputeJob; @@ -92,11 +91,7 @@ public class GridSessionSetJobAttributeWaitListenerSelfTest extends GridCommonAb for (int i = 0; i < 5; i++) { refreshInitialData(); - IgniteCompute comp = ignite.compute().withAsync(); - - comp.execute(GridTaskSessionTestTask.class.getName(), null); - - ComputeTaskFuture<?> fut = comp.future(); + ComputeTaskFuture<?> fut = ignite.compute().executeAsync(GridTaskSessionTestTask.class.getName(), null); assert fut != null; http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetTaskAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetTaskAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetTaskAttributeSelfTest.java index 4092e74..ec8d5a3 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetTaskAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetTaskAttributeSelfTest.java @@ -23,7 +23,6 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.ignite.Ignite; -import org.apache.ignite.IgniteCompute; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.compute.ComputeJob; @@ -107,11 +106,7 @@ public class GridSessionSetTaskAttributeSelfTest extends GridCommonAbstractTest private void checkTask(int num) { Ignite ignite = G.ignite(getTestIgniteInstanceName()); - IgniteCompute comp = ignite.compute().withAsync(); - - comp.execute(GridTaskSessionTestTask.class.getName(), num); - - ComputeTaskFuture<?> fut = comp.future(); + ComputeTaskFuture<?> fut = ignite.compute().executeAsync(GridTaskSessionTestTask.class.getName(), num); Object res = fut.get(); http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/core/src/test/java/org/apache/ignite/session/GridSessionTaskWaitJobAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionTaskWaitJobAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionTaskWaitJobAttributeSelfTest.java index 41f6457..7150a27 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionTaskWaitJobAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionTaskWaitJobAttributeSelfTest.java @@ -23,7 +23,6 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.ignite.Ignite; -import org.apache.ignite.IgniteCompute; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.compute.ComputeJob; @@ -107,11 +106,7 @@ public class GridSessionTaskWaitJobAttributeSelfTest extends GridCommonAbstractT private void checkTask(int num) { Ignite ignite = G.ignite(getTestIgniteInstanceName()); - IgniteCompute comp = ignite.compute().withAsync(); - - comp.execute(GridTaskSessionTestTask.class.getName(), num); - - ComputeTaskFuture<?> fut = comp.future(); + ComputeTaskFuture<?> fut = ignite.compute().executeAsync(GridTaskSessionTestTask.class.getName(), num); Object res = fut.get(); http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java index f3f39ef..06f47b4 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java @@ -24,8 +24,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import org.apache.ignite.Ignite; -import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.IgniteCompute; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.compute.ComputeJobAdapter; @@ -215,11 +213,7 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest { ignite1.compute().localDeployTask(TestSessionTask.class, TestSessionTask.class.getClassLoader()); - IgniteCompute comp = ignite1.compute().withAsync(); - - comp.execute(TestSessionTask.class.getName(), type); - - ComputeTaskFuture<?> fut = comp.future(); + ComputeTaskFuture<?> fut = ignite1.compute().executeAsync(TestSessionTask.class.getName(), type); fut.getTaskSession().mapFuture().get(); @@ -254,7 +248,6 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest { * @param ses Session. * @param prefix Prefix. * @param type Type. - * @throws IgniteCheckedException If failed. */ private static void checkSessionAttributes(ComputeTaskSession ses, String prefix, WaitAttributeType type) { assert ses != null; http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/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 bb2e046..8aba684 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 @@ -28,6 +28,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.LinkedBlockingQueue; import javax.cache.Cache; import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; import org.apache.ignite.cache.store.CacheStore; import org.apache.ignite.internal.processors.cache.CacheEntryImpl; import org.apache.ignite.internal.util.lang.GridMetadataAwareAdapter; @@ -547,6 +548,11 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object } /** {@inheritDoc} */ + @Override public IgniteFuture<Void> commitAsync() throws IgniteException { + return null; + } + + /** {@inheritDoc} */ @Override public void close() { // No-op. } @@ -570,5 +576,10 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object @Override public void rollback() { // No-op. } + + /** {@inheritDoc} */ + @Override public IgniteFuture<Void> rollbackAsync() throws IgniteException { + return null; + } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/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 7b41b6c..ec31e59 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 @@ -929,11 +929,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { */ protected <R> ComputeTaskFuture<R> executeAsync(IgniteCompute comp, ComputeTask task, @Nullable Object arg) throws IgniteCheckedException { - comp = comp.withAsync(); - - assertNull(comp.execute(task, arg)); - - ComputeTaskFuture<R> fut = comp.future(); + ComputeTaskFuture<R> fut = comp.executeAsync(task, arg); assertNotNull(fut); @@ -949,11 +945,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { */ protected <R> ComputeTaskFuture<R> executeAsync(IgniteCompute comp, String taskName, @Nullable Object arg) throws IgniteCheckedException { - comp = comp.withAsync(); - - assertNull(comp.execute(taskName, arg)); - - ComputeTaskFuture<R> fut = comp.future(); + ComputeTaskFuture<R> fut = comp.executeAsync(taskName, arg); assertNotNull(fut); @@ -970,11 +962,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { @SuppressWarnings("unchecked") protected <R> ComputeTaskFuture<R> executeAsync(IgniteCompute comp, Class taskCls, @Nullable Object arg) throws IgniteCheckedException { - comp = comp.withAsync(); - - assertNull(comp.execute(taskCls, arg)); - - ComputeTaskFuture<R> fut = comp.future(); + ComputeTaskFuture<R> fut = comp.executeAsync(taskCls, arg); assertNotNull(fut); @@ -990,13 +978,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { */ protected <T extends Event> IgniteFuture<T> waitForLocalEvent(IgniteEvents evts, @Nullable IgnitePredicate<T> filter, @Nullable int... types) throws IgniteCheckedException { - evts = evts.withAsync(); - - assertTrue(evts.isAsync()); - - assertNull(evts.waitForLocal(filter, types)); - - IgniteFuture<T> fut = evts.future(); + IgniteFuture<T> fut = evts.waitForLocalAsync(filter, types); assertNotNull(fut); http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java index 46053b3..01207b6 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java @@ -143,17 +143,34 @@ public class IgniteCacheProcessProxy<K, V> implements IgniteCache<K, V> { } /** {@inheritDoc} */ + @Override public IgniteFuture<Void> loadCacheAsync(@Nullable IgniteBiPredicate<K, V> p, + @Nullable Object... args) throws CacheException { + throw new UnsupportedOperationException("Method should be supported."); + } + + /** {@inheritDoc} */ @Override public void localLoadCache(@Nullable IgniteBiPredicate<K, V> p, @Nullable Object... args) throws CacheException { compute.call(new LocalLoadCacheTask<>(cacheName, isAsync, p, args)); } /** {@inheritDoc} */ + @Override public IgniteFuture<Void> localLoadCacheAsync(@Nullable IgniteBiPredicate<K, V> p, + @Nullable Object... args) throws CacheException { + throw new UnsupportedOperationException("Method should be supported."); + } + + /** {@inheritDoc} */ @Override public V getAndPutIfAbsent(K key, V val) throws CacheException { return compute.call(new GetAndPutIfAbsentTask<>(cacheName, isAsync, key, val)); } /** {@inheritDoc} */ + @Override public IgniteFuture<V> getAndPutIfAbsentAsync(K key, V val) throws CacheException { + return compute.callAsync(new GetAndPutIfAbsentTask<>(cacheName, isAsync, key, val)); + } + + /** {@inheritDoc} */ @Override public Lock lock(K key) { throw new UnsupportedOperationException("Method should be supported."); } @@ -224,15 +241,28 @@ public class IgniteCacheProcessProxy<K, V> implements IgniteCache<K, V> { } /** {@inheritDoc} */ + @Override public IgniteFuture<Integer> sizeAsync(CachePeekMode... peekModes) throws CacheException { + return compute.callAsync(new SizeTask(cacheName, isAsync, peekModes, false)); + } + + /** {@inheritDoc} */ @Override public long sizeLong(CachePeekMode... peekModes) throws CacheException { return compute.call(new SizeLongTask(cacheName, isAsync, peekModes, false)); } + @Override public IgniteFuture<Long> sizeLongAsync(CachePeekMode... peekModes) throws CacheException { + return compute.callAsync(new SizeLongTask(cacheName, isAsync, peekModes, false)); + } + /** {@inheritDoc} */ @Override public long sizeLong(int partition, CachePeekMode... peekModes) throws CacheException { return compute.call(new PartitionSizeLongTask(cacheName, isAsync, peekModes, partition, false)); } + @Override public IgniteFuture<Long> sizeLongAsync(int partition, CachePeekMode... peekModes) throws CacheException { + return compute.callAsync(new PartitionSizeLongTask(cacheName, isAsync, peekModes, partition, false)); + } + /** {@inheritDoc} */ @Override public int localSize(CachePeekMode... peekModes) { return compute.call(new SizeTask(cacheName, isAsync, peekModes, true)); @@ -257,36 +287,72 @@ public class IgniteCacheProcessProxy<K, V> implements IgniteCache<K, V> { } /** {@inheritDoc} */ + @Override public <T> IgniteFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync( + Map<? extends K, ? extends EntryProcessor<K, V, T>> map, Object... args) { + throw new UnsupportedOperationException("Method should be supported."); + } + + /** {@inheritDoc} */ @Override public V get(K key) { return compute.call(new GetTask<K, V>(cacheName, isAsync, key)); } /** {@inheritDoc} */ + @Override public IgniteFuture<V> getAsync(K key) { + return compute.callAsync(new GetTask<K, V>(cacheName, isAsync, key)); + } + + /** {@inheritDoc} */ @Override public CacheEntry<K, V> getEntry(K key) { return compute.call(new GetEntryTask<K, V>(cacheName, isAsync, key)); } /** {@inheritDoc} */ + @Override public IgniteFuture<CacheEntry<K, V>> getEntryAsync(K key) { + return compute.callAsync(new GetEntryTask<K, V>(cacheName, isAsync, key)); + } + + /** {@inheritDoc} */ @Override public Map<K, V> getAll(Set<? extends K> keys) { return compute.call(new GetAllTask<K, V>(cacheName, isAsync, keys)); } /** {@inheritDoc} */ + @Override public IgniteFuture<Map<K, V>> getAllAsync(Set<? extends K> keys) { + return compute.callAsync(new GetAllTask<K, V>(cacheName, isAsync, keys)); + } + + /** {@inheritDoc} */ @Override public Collection<CacheEntry<K, V>> getEntries(Set<? extends K> keys) { return compute.call(new GetEntriesTask<K, V>(cacheName, isAsync, keys)); } /** {@inheritDoc} */ + @Override public IgniteFuture<Collection<CacheEntry<K, V>>> getEntriesAsync(Set<? extends K> keys) { + return compute.callAsync(new GetEntriesTask<K, V>(cacheName, isAsync, keys)); + } + + /** {@inheritDoc} */ @Override public Map<K, V> getAllOutTx(Set<? extends K> keys) { return compute.call(new GetAllOutTxTask<K, V>(cacheName, isAsync, keys)); } /** {@inheritDoc} */ + @Override public IgniteFuture<Map<K, V>> getAllOutTxAsync(Set<? extends K> keys) { + return compute.callAsync(new GetAllOutTxTask<K, V>(cacheName, isAsync, keys)); + } + + /** {@inheritDoc} */ @Override public boolean containsKey(K key) { return compute.call(new ContainsKeyTask<>(cacheName, isAsync, key)); } /** {@inheritDoc} */ + @Override public IgniteFuture<Boolean> containsKeyAsync(K key) { + return compute.callAsync(new ContainsKeyTask<>(cacheName, isAsync, key)); + } + + /** {@inheritDoc} */ @Override public void loadAll(Set<? extends K> keys, boolean replaceExistVals, CompletionListener completionLsnr) { throw new UnsupportedOperationException("Oparetion can't be supported automatically."); } @@ -297,81 +363,161 @@ public class IgniteCacheProcessProxy<K, V> implements IgniteCache<K, V> { } /** {@inheritDoc} */ + @Override public IgniteFuture<Boolean> containsKeysAsync(Set<? extends K> keys) { + return compute.callAsync(new ContainsKeysTask<>(cacheName, isAsync, keys)); + } + + /** {@inheritDoc} */ @Override public void put(K key, V val) { compute.call(new PutTask<>(cacheName, isAsync, expiryPlc, key, val)); } /** {@inheritDoc} */ + @Override public IgniteFuture<Void> putAsync(K key, V val) { + return compute.callAsync(new PutTask<>(cacheName, isAsync, expiryPlc, key, val)); + } + + /** {@inheritDoc} */ @Override public V getAndPut(K key, V val) { return compute.call(new GetAndPutTask<>(cacheName, isAsync, key, val)); } /** {@inheritDoc} */ + @Override public IgniteFuture<V> getAndPutAsync(K key, V val) { + return compute.callAsync(new GetAndPutTask<>(cacheName, isAsync, key, val)); + } + + /** {@inheritDoc} */ @Override public void putAll(Map<? extends K, ? extends V> map) { compute.call(new PutAllTask<>(cacheName, isAsync, map)); } /** {@inheritDoc} */ + @Override public IgniteFuture<Void> putAllAsync(Map<? extends K, ? extends V> map) { + return compute.callAsync(new PutAllTask<>(cacheName, isAsync, map)); + } + + /** {@inheritDoc} */ @Override public boolean putIfAbsent(K key, V val) { return compute.call(new PutIfAbsentTask<>(cacheName, isAsync, key, val)); } /** {@inheritDoc} */ + @Override public IgniteFuture<Boolean> putIfAbsentAsync(K key, V val) { + return compute.callAsync(new PutIfAbsentTask<>(cacheName, isAsync, key, val)); + } + + /** {@inheritDoc} */ @Override public boolean remove(K key) { return compute.call(new RemoveTask<>(cacheName, isAsync, key)); } /** {@inheritDoc} */ + @Override public IgniteFuture<Boolean> removeAsync(K key) { + return compute.callAsync(new RemoveTask<>(cacheName, isAsync, key)); + } + + /** {@inheritDoc} */ @Override public boolean remove(K key, V oldVal) { return compute.call(new RemoveIfExistsTask<>(cacheName, isAsync, key, oldVal)); } /** {@inheritDoc} */ + @Override public IgniteFuture<Boolean> removeAsync(K key, V oldVal) { + return compute.callAsync(new RemoveIfExistsTask<>(cacheName, isAsync, key, oldVal)); + } + + /** {@inheritDoc} */ @Override public V getAndRemove(K key) { return compute.call(new GetAndRemoveTask<K, V>(cacheName, isAsync, key)); } /** {@inheritDoc} */ + @Override public IgniteFuture<V> getAndRemoveAsync(K key) { + return compute.callAsync(new GetAndRemoveTask<K, V>(cacheName, isAsync, key)); + } + + /** {@inheritDoc} */ @Override public boolean replace(K key, V oldVal, V newVal) { return compute.call(new ReplaceIfExistsTask<>(cacheName, isAsync, key, oldVal, newVal)); } /** {@inheritDoc} */ + @Override public IgniteFuture<Boolean> replaceAsync(K key, V oldVal, V newVal) { + return compute.callAsync(new ReplaceIfExistsTask<>(cacheName, isAsync, key, oldVal, newVal)); + } + + /** {@inheritDoc} */ @Override public boolean replace(K key, V val) { return compute.call(new ReplaceTask<>(cacheName, isAsync, key, val)); } /** {@inheritDoc} */ + @Override public IgniteFuture<Boolean> replaceAsync(K key, V val) { + return compute.callAsync(new ReplaceTask<>(cacheName, isAsync, key, val)); + } + + /** {@inheritDoc} */ @Override public V getAndReplace(K key, V val) { return compute.call(new GetAndReplaceTask<>(cacheName, isAsync, key, val)); } /** {@inheritDoc} */ + @Override public IgniteFuture<V> getAndReplaceAsync(K key, V val) { + return compute.callAsync(new GetAndReplaceTask<>(cacheName, isAsync, key, val)); + } + + /** {@inheritDoc} */ @Override public void removeAll(Set<? extends K> keys) { compute.call(new RemoveAllKeysTask<>(cacheName, isAsync, keys)); } /** {@inheritDoc} */ + @Override public IgniteFuture<Void> removeAllAsync(Set<? extends K> keys) { + return compute.callAsync(new RemoveAllKeysTask<>(cacheName, isAsync, keys)); + } + + /** {@inheritDoc} */ @Override public void removeAll() { compute.call(new RemoveAllTask<K, V>(cacheName, isAsync)); } /** {@inheritDoc} */ + @Override public IgniteFuture<Void> removeAllAsync() { + return compute.callAsync(new RemoveAllTask<K, V>(cacheName, isAsync)); + } + + /** {@inheritDoc} */ @Override public void clear() { compute.call(new ClearTask(cacheName, isAsync)); } /** {@inheritDoc} */ + @Override public IgniteFuture<Void> clearAsync() { + return compute.callAsync(new ClearTask(cacheName, isAsync)); + } + + /** {@inheritDoc} */ @Override public void clear(K key) { compute.call(new ClearKeyTask<>(cacheName, isAsync, false, key)); } /** {@inheritDoc} */ + @Override public IgniteFuture<Void> clearAsync(K key) { + return compute.callAsync(new ClearKeyTask<>(cacheName, isAsync, false, key)); + } + + /** {@inheritDoc} */ @Override public void clearAll(Set<? extends K> keys) { compute.call(new ClearAllKeys<>(cacheName, isAsync, false, keys)); } /** {@inheritDoc} */ + @Override public IgniteFuture<Void> clearAllAsync(Set<? extends K> keys) { + return compute.callAsync(new ClearAllKeys<>(cacheName, isAsync, false, keys)); + } + + /** {@inheritDoc} */ @Override public void localClear(K key) { compute.call(new ClearKeyTask<>(cacheName, isAsync, true, key)); } @@ -387,11 +533,23 @@ public class IgniteCacheProcessProxy<K, V> implements IgniteCache<K, V> { } /** {@inheritDoc} */ + @Override public <T> IgniteFuture<T> invokeAsync( + K key, EntryProcessor<K, V, T> processor, Object... args) { + return compute.callAsync(new InvokeTask<>(cacheName, isAsync, key, processor, args)); + } + + /** {@inheritDoc} */ @Override public <T> T invoke(K key, CacheEntryProcessor<K, V, T> processor, Object... args) { return compute.call(new InvokeTask<>(cacheName, isAsync, key, processor, args)); } /** {@inheritDoc} */ + @Override public <T> IgniteFuture<T> invokeAsync(K key, CacheEntryProcessor<K, V, T> processor, + Object... args) { + return compute.callAsync(new InvokeTask<>(cacheName, isAsync, key, processor, args)); + } + + /** {@inheritDoc} */ @Override public <T> Map<K, EntryProcessorResult<T>> invokeAll( Set<? extends K> keys, EntryProcessor<K, V, T> processor, @@ -401,6 +559,12 @@ public class IgniteCacheProcessProxy<K, V> implements IgniteCache<K, V> { } /** {@inheritDoc} */ + @Override public <T> IgniteFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync(Set<? extends K> keys, + EntryProcessor<K, V, T> processor, Object... args) { + return compute.callAsync(new InvokeAllTask<>(cacheName, isAsync, keys, processor, args)); + } + + /** {@inheritDoc} */ @Override public String getName() { return compute.call(new GetNameTask(cacheName, isAsync)); } @@ -462,6 +626,12 @@ public class IgniteCacheProcessProxy<K, V> implements IgniteCache<K, V> { } /** {@inheritDoc} */ + @Override public <T> IgniteFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync(Set<? extends K> keys, + CacheEntryProcessor<K, V, T> entryProcessor, Object... args) { + throw new UnsupportedOperationException("Method should be supported."); + } + + /** {@inheritDoc} */ @Override public IgniteFuture<?> rebalance() { throw new UnsupportedOperationException("Method should be supported."); } @@ -1335,6 +1505,7 @@ public class IgniteCacheProcessProxy<K, V> implements IgniteCache<K, V> { /** * @param cacheName Cache name. * @param async Async. + * @param loc Local flag. * @param key Key. */ public ClearKeyTask(String cacheName, boolean async, boolean loc, K key) { @@ -1367,6 +1538,7 @@ public class IgniteCacheProcessProxy<K, V> implements IgniteCache<K, V> { /** * @param cacheName Cache name. * @param async Async. + * @param loc Local flag. * @param keys Keys. */ public ClearAllKeys(String cacheName, boolean async, boolean loc, Set<? extends K> keys) { http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteClusterProcessProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteClusterProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteClusterProcessProxy.java index 76a88d9..a0d10c4 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteClusterProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteClusterProcessProxy.java @@ -121,12 +121,25 @@ public class IgniteClusterProcessProxy implements IgniteClusterEx { } /** {@inheritDoc} */ + @Override public IgniteFuture<Collection<ClusterStartNodeResult>> startNodesAsync(File file, boolean restart, + int timeout, int maxConn) throws IgniteException { + throw new UnsupportedOperationException("Operation is not supported yet."); + } + + /** {@inheritDoc} */ @Override public Collection<ClusterStartNodeResult> startNodes(Collection<Map<String, Object>> hosts, @Nullable Map<String, Object> dflts, boolean restart, int timeout, int maxConn) throws IgniteException { throw new UnsupportedOperationException("Operation is not supported yet."); } /** {@inheritDoc} */ + @Override public IgniteFuture<Collection<ClusterStartNodeResult>> startNodesAsync( + Collection<Map<String, Object>> hosts, @Nullable Map<String, Object> dflts, + boolean restart, int timeout, int maxConn) throws IgniteException { + throw new UnsupportedOperationException("Operation is not supported yet."); + } + + /** {@inheritDoc} */ @Override public void stopNodes() throws IgniteException { throw new UnsupportedOperationException("Operation is not supported yet."); } http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteEventsProcessProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteEventsProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteEventsProcessProxy.java index d5af81e..a925300 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteEventsProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteEventsProcessProxy.java @@ -59,12 +59,25 @@ public class IgniteEventsProcessProxy implements IgniteEvents { } /** {@inheritDoc} */ + @Override public <T extends Event> IgniteFuture<List<T>> remoteQueryAsync(IgnitePredicate<T> p, long timeout, + @Nullable int... types) throws IgniteException { + throw new UnsupportedOperationException("Operation isn't supported yet."); + } + + /** {@inheritDoc} */ @Override public <T extends Event> UUID remoteListen(@Nullable IgniteBiPredicate<UUID, T> locLsnr, @Nullable IgnitePredicate<T> rmtFilter, @Nullable int... types) throws IgniteException { throw new UnsupportedOperationException("Operation isn't supported yet."); } /** {@inheritDoc} */ + @Override public <T extends Event> IgniteFuture<UUID> remoteListenAsync( + @Nullable IgniteBiPredicate<UUID, T> locLsnr, @Nullable IgnitePredicate<T> rmtFilter, + @Nullable int... types) throws IgniteException { + throw new UnsupportedOperationException("Operation isn't supported yet."); + } + + /** {@inheritDoc} */ @Override public <T extends Event> UUID remoteListen(int bufSize, long interval, boolean autoUnsubscribe, @Nullable IgniteBiPredicate<UUID, T> locLsnr, @Nullable IgnitePredicate<T> rmtFilter, @Nullable int... types) throws IgniteException { @@ -72,17 +85,35 @@ public class IgniteEventsProcessProxy implements IgniteEvents { } /** {@inheritDoc} */ + @Override public <T extends Event> IgniteFuture<UUID> remoteListenAsync(int bufSize, long interval, + boolean autoUnsubscribe, @Nullable IgniteBiPredicate<UUID, T> locLsnr, @Nullable IgnitePredicate<T> rmtFilter, + @Nullable int... types) throws IgniteException { + throw new UnsupportedOperationException("Operation isn't supported yet."); + } + + /** {@inheritDoc} */ @Override public void stopRemoteListen(UUID opId) throws IgniteException { throw new UnsupportedOperationException("Operation isn't supported yet."); } /** {@inheritDoc} */ + @Override public IgniteFuture<Void> stopRemoteListenAsync(UUID opId) throws IgniteException { + throw new UnsupportedOperationException("Operation isn't supported yet."); + } + + /** {@inheritDoc} */ @Override public <T extends Event> T waitForLocal(@Nullable IgnitePredicate<T> filter, @Nullable int... types) throws IgniteException { throw new UnsupportedOperationException("Operation isn't supported yet."); } /** {@inheritDoc} */ + @Override public <T extends Event> IgniteFuture<T> waitForLocalAsync(@Nullable IgnitePredicate<T> filter, + @Nullable int... types) throws IgniteException { + throw new UnsupportedOperationException("Operation isn't supported yet."); + } + + /** {@inheritDoc} */ @Override public <T extends Event> Collection<T> localQuery(IgnitePredicate<T> p, @Nullable int... types) { throw new UnsupportedOperationException("Operation isn't supported yet."); } http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunTest.java index fbc94ed..a1603d8 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunTest.java @@ -589,7 +589,7 @@ public class IgniteCacheLockPartitionOnAffinityRunTest extends IgniteCacheLockPa final int orgId = primaryKey(grid(0).cache(Organization.class.getSimpleName())); try { - grid(1).compute().withAsync().affinityRun( + grid(1).compute().affinityRunAsync( Arrays.asList(Organization.class.getSimpleName(), Person.class.getSimpleName()), new Integer(orgId), new IgniteRunnable() { @@ -630,7 +630,7 @@ public class IgniteCacheLockPartitionOnAffinityRunTest extends IgniteCacheLockPa try { - grid(1).compute().withAsync().affinityCall( + grid(1).compute().affinityCallAsync( Arrays.asList(Organization.class.getSimpleName(), Person.class.getSimpleName()), new Integer(orgId), new IgniteCallable<Object>() { @@ -678,7 +678,7 @@ public class IgniteCacheLockPartitionOnAffinityRunTest extends IgniteCacheLockPa final int orgId = primaryKey(grid(0).cache(Organization.class.getSimpleName())); try { - grid(1).compute().withAsync().affinityRun( + grid(1).compute().affinityRunAsync( Arrays.asList(Organization.class.getSimpleName(), Person.class.getSimpleName()), new Integer(orgId), new RunnableWithMasterLeave() { http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java index dc4a41f..0338429 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryLoadSelfTest.java @@ -138,11 +138,7 @@ public class IgniteCacheQueryLoadSelfTest extends GridCommonAbstractTest { public void testLoadCacheAsync() throws Exception { IgniteCache<Integer, ValueObject> cache = grid().cache(null); - IgniteCache<Integer, ValueObject> asyncCache = cache.withAsync(); - - asyncCache.loadCache(null, 0); - - asyncCache.future().get(); + cache.loadCacheAsync(null, 0).get(); assert cache.size() == PUT_CNT; @@ -183,16 +179,12 @@ public class IgniteCacheQueryLoadSelfTest extends GridCommonAbstractTest { public void testLoadCacheAsyncFiltered() throws Exception { IgniteCache<Integer, ValueObject> cache = grid().cache(null); - IgniteCache<Integer, ValueObject> asyncCache = cache.withAsync(); - - asyncCache.loadCache(new P2<Integer, ValueObject>() { + cache.loadCacheAsync(new P2<Integer, ValueObject>() { @Override public boolean apply(Integer key, ValueObject val) { return key >= 5; } - }, 0); - - asyncCache.future().get(); + }, 0).get(); assert cache.localSize() == PUT_CNT - 5; @@ -212,11 +204,7 @@ public class IgniteCacheQueryLoadSelfTest extends GridCommonAbstractTest { IgniteCache<Integer, ValueObject> cache = jcache(); - IgniteCache<Integer, ValueObject> asyncCache = cache.withAsync(); - - asyncCache.get(1); - - assert ((ValueObject)asyncCache.future().get()).value() == 1; + assert cache.getAsync(1).get().value() == 1; assert cache.size() == 1; http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/platforms/cpp/jni/include/ignite/jni/exports.h ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/jni/include/ignite/jni/exports.h b/modules/platforms/cpp/jni/include/ignite/jni/exports.h index 06be75d..6fe91c7 100644 --- a/modules/platforms/cpp/jni/include/ignite/jni/exports.h +++ b/modules/platforms/cpp/jni/include/ignite/jni/exports.h @@ -67,8 +67,6 @@ extern "C" { void IGNITE_CALL IgniteTargetOutStream(gcj::JniContext* ctx, void* obj, int opType, long long memPtr); void* IGNITE_CALL IgniteTargetOutObject(gcj::JniContext* ctx, void* obj, int opType); void IGNITE_CALL IgniteTargetInStreamAsync(gcj::JniContext* ctx, void* obj, int opType, long long memPtr); - void IGNITE_CALL IgniteTargetListenFuture(gcj::JniContext* ctx, void* obj, long long futId, int typ); - void IGNITE_CALL IgniteTargetListenFutureForOperation(gcj::JniContext* ctx, void* obj, long long futId, int typ, int opId); void* IGNITE_CALL IgniteAcquire(gcj::JniContext* ctx, void* obj); void IGNITE_CALL IgniteRelease(void* obj); http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/platforms/cpp/jni/include/ignite/jni/java.h ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/jni/include/ignite/jni/java.h b/modules/platforms/cpp/jni/include/ignite/jni/java.h index 7c5d684..85955b3 100644 --- a/modules/platforms/cpp/jni/include/ignite/jni/java.h +++ b/modules/platforms/cpp/jni/include/ignite/jni/java.h @@ -211,8 +211,6 @@ namespace ignite jmethodID m_PlatformTarget_inStreamAsync; jmethodID m_PlatformTarget_inStreamOutStream; jmethodID m_PlatformTarget_inObjectStreamOutObjectStream; - jmethodID m_PlatformTarget_listenFuture; - jmethodID m_PlatformTarget_listenFutureForOperation; jclass c_PlatformUtils; jmethodID m_PlatformUtils_reallocate; @@ -389,8 +387,6 @@ namespace ignite void TargetOutStream(jobject obj, int opType, long long memPtr, JniErrorInfo* errInfo = NULL); jobject TargetOutObject(jobject obj, int opType, JniErrorInfo* errInfo = NULL); void TargetInStreamAsync(jobject obj, int type, long long memPtr, JniErrorInfo* errInfo = NULL); - void TargetListenFuture(jobject obj, long long futId, int typ); - void TargetListenFutureForOperation(jobject obj, long long futId, int typ, int opId); jobject CacheOutOpQueryCursor(jobject obj, int type, long long memPtr, JniErrorInfo* errInfo = NULL); jobject CacheOutOpContinuousQuery(jobject obj, int type, long long memPtr, JniErrorInfo* errInfo = NULL); http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/platforms/cpp/jni/project/vs/module.def ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/jni/project/vs/module.def b/modules/platforms/cpp/jni/project/vs/module.def index 8159f8d..82cc41e 100644 --- a/modules/platforms/cpp/jni/project/vs/module.def +++ b/modules/platforms/cpp/jni/project/vs/module.def @@ -20,8 +20,6 @@ IgniteTargetInStreamOutLong @18 IgniteTargetOutStream @19 IgniteTargetInStreamOutStream @20 IgniteTargetInObjectStreamOutObjectStream @21 -IgniteTargetListenFuture @22 -IgniteTargetListenFutureForOperation @23 IgniteTargetInLongOutLong @24 IgniteTargetInStreamAsync @25 IgniteProcessorCompute @64 http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/platforms/cpp/jni/src/exports.cpp ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/jni/src/exports.cpp b/modules/platforms/cpp/jni/src/exports.cpp index 6c590e4..2aecd59 100644 --- a/modules/platforms/cpp/jni/src/exports.cpp +++ b/modules/platforms/cpp/jni/src/exports.cpp @@ -186,14 +186,6 @@ extern "C" { ctx->TargetInStreamAsync(static_cast<jobject>(obj), opType, memPtr); } - void IGNITE_CALL IgniteTargetListenFuture(gcj::JniContext* ctx, void* obj, long long futId, int typ) { - ctx->TargetListenFuture(static_cast<jobject>(obj), futId, typ); - } - - void IGNITE_CALL IgniteTargetListenFutureForOperation(gcj::JniContext* ctx, void* obj, long long futId, int typ, int opId) { - ctx->TargetListenFutureForOperation(static_cast<jobject>(obj), futId, typ, opId); - } - void* IGNITE_CALL IgniteAcquire(gcj::JniContext* ctx, void* obj) { return ctx->Acquire(static_cast<jobject>(obj)); } http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/platforms/cpp/jni/src/java.cpp ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/jni/src/java.cpp b/modules/platforms/cpp/jni/src/java.cpp index 004a99c..809aa17 100644 --- a/modules/platforms/cpp/jni/src/java.cpp +++ b/modules/platforms/cpp/jni/src/java.cpp @@ -259,8 +259,6 @@ namespace ignite JniMethod M_PLATFORM_TARGET_OUT_STREAM = JniMethod("outStream", "(IJ)V", false); JniMethod M_PLATFORM_TARGET_OUT_OBJECT = JniMethod("outObject", "(I)Ljava/lang/Object;", false); JniMethod M_PLATFORM_TARGET_IN_STREAM_ASYNC = JniMethod("inStreamAsync", "(IJ)V", false); - JniMethod M_PLATFORM_TARGET_LISTEN_FUTURE = JniMethod("listenFuture", "(JI)V", false); - JniMethod M_PLATFORM_TARGET_LISTEN_FOR_OPERATION = JniMethod("listenFutureForOperation", "(JII)V", false); const char* C_PLATFORM_CALLBACK_UTILS = "org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils"; @@ -592,8 +590,6 @@ namespace ignite m_PlatformTarget_inStreamOutStream = FindMethod(env, c_PlatformTarget, M_PLATFORM_TARGET_IN_STREAM_OUT_STREAM); m_PlatformTarget_inObjectStreamOutObjectStream = FindMethod(env, c_PlatformTarget, M_PLATFORM_TARGET_IN_OBJECT_STREAM_OUT_OBJECT_STREAM); m_PlatformTarget_inStreamAsync = FindMethod(env, c_PlatformTarget, M_PLATFORM_TARGET_IN_STREAM_ASYNC); - m_PlatformTarget_listenFuture = FindMethod(env, c_PlatformTarget, M_PLATFORM_TARGET_LISTEN_FUTURE); - m_PlatformTarget_listenFutureForOperation = FindMethod(env, c_PlatformTarget, M_PLATFORM_TARGET_LISTEN_FOR_OPERATION); c_PlatformUtils = FindClass(env, C_PLATFORM_UTILS); m_PlatformUtils_reallocate = FindMethod(env, c_PlatformUtils, M_PLATFORM_UTILS_REALLOC); @@ -1396,22 +1392,6 @@ namespace ignite ExceptionCheck(env, err); } - void JniContext::TargetListenFuture(jobject obj, long long futId, int typ) { - JNIEnv* env = Attach(); - - env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformTarget_listenFuture, futId, typ); - - ExceptionCheck(env); - } - - void JniContext::TargetListenFutureForOperation(jobject obj, long long futId, int typ, int opId) { - JNIEnv* env = Attach(); - - env->CallVoidMethod(obj, jvm->GetMembers().m_PlatformTarget_listenFutureForOperation, futId, typ, opId); - - ExceptionCheck(env); - } - jobject JniContext::CacheOutOpQueryCursor(jobject obj, int type, long long memPtr, JniErrorInfo* err) { JNIEnv* env = Attach(); http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala index 737a798..b1a6b4f 100644 --- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala +++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala @@ -375,11 +375,9 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl */ def callAsync$[R](@Nullable s: Seq[Call[R]], @Nullable p: NF): IgniteFuture[java.util.Collection[R]] = { - val comp = value.ignite().compute(forPredicate(p)).withAsync() + val comp = value.ignite().compute(forPredicate(p)) - comp.call[R](toJavaCollection(s, (f: Call[R]) => toCallable(f))) - - comp.future() + comp.callAsync[R](toJavaCollection(s, (f: Call[R]) => toCallable(f))) } /** @@ -435,11 +433,9 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl * @see `org.apache.ignite.cluster.ClusterGroup.call(...)` */ def runAsync$(@Nullable s: Seq[Run], @Nullable p: NF): IgniteFuture[_] = { - val comp = value.ignite().compute(forPredicate(p)).withAsync() - - comp.run(toJavaCollection(s, (f: Run) => toRunnable(f))) + val comp = value.ignite().compute(forPredicate(p)) - comp.future() + comp.runAsync(toJavaCollection(s, (f: Run) => toRunnable(f))) } /** @@ -494,11 +490,9 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl def reduceAsync$[R1, R2](s: Seq[Call[R1]], r: Seq[R1] => R2, @Nullable p: NF): IgniteFuture[R2] = { assert(s != null && r != null) - val comp = value.ignite().compute(forPredicate(p)).withAsync() + val comp = value.ignite().compute(forPredicate(p)) - comp.call(toJavaCollection(s, (f: Call[R1]) => toCallable(f)), r) - - comp.future() + comp.callAsync(toJavaCollection(s, (f: Call[R1]) => toCallable(f)), r) } /** @@ -648,10 +642,8 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl */ def affinityRunAsync$(cacheName: String, @Nullable affKey: Any, @Nullable r: Run, @Nullable p: NF): IgniteFuture[_] = { - val comp = value.ignite().compute(forPredicate(p)).withAsync() - - comp.affinityRun(cacheName, affKey, toRunnable(r)) + val comp = value.ignite().compute(forPredicate(p)) - comp.future() + comp.affinityRunAsync(cacheName, affKey, toRunnable(r)) } } http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java index 22c6977..5de7363 100644 --- a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java +++ b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java @@ -1051,10 +1051,6 @@ public class IgniteProjectionStartStopRestartSelfTest extends GridCommonAbstract boolean restart, int timeout, int maxConn) { - cluster = cluster.withAsync(); - - assertNull(cluster.startNodes(hosts, dflts, restart, timeout, maxConn)); - - return cluster.<Collection<ClusterStartNodeResult>>future().get(WAIT_TIMEOUT); + return cluster.startNodesAsync(hosts, dflts, restart, timeout, maxConn).get(WAIT_TIMEOUT); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala index cdc5b47..4291103 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala @@ -47,27 +47,17 @@ class VisorTasksCommandSpec extends FunSpec with Matchers with BeforeAndAfterAll visor.open(config("visor-demo-node"), "n/a") try { - val compute = ignite.compute().withAsync + val compute = ignite.compute() - compute.withName("TestTask1").execute(new TestTask1(), null) + val fut1 = compute.withName("TestTask1").executeAsync(new TestTask1(), null) - val fut1 = compute.future() + val fut2 = compute.withName("TestTask1").executeAsync(new TestTask1(), null) - compute.withName("TestTask1").execute(new TestTask1(), null) + val fut3 = compute.withName("TestTask1").executeAsync(new TestTask1(), null) - val fut2 = compute.future() + val fut4 = compute.withName("TestTask2").executeAsync(new TestTask2(), null) - compute.withName("TestTask1").execute(new TestTask1(), null) - - val fut3 = compute.future() - - compute.withName("TestTask2").execute(new TestTask2(), null) - - val fut4 = compute.future() - - compute.withName("Test3").execute(new Test3(), null) - - val fut5 = compute.future() + val fut5 = compute.withName("Test3").executeAsync(new Test3(), null) fut1.get fut2.get http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicInvokeRetryBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicInvokeRetryBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicInvokeRetryBenchmark.java index 6e65746..f4e5ed7 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicInvokeRetryBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicInvokeRetryBenchmark.java @@ -77,8 +77,7 @@ public class IgniteAtomicInvokeRetryBenchmark extends IgniteFailoverAbstractBenc for (Map.Entry<String, AtomicLong> e : nextValMap.entrySet()) { String key = e.getKey(); - asyncCache.get(key); - Set set = asyncCache.<Set>future().get(timeout); + Set set = cache.getAsync(key).get(timeout); if (set == null || e.getValue() == null || !Objects.equals(e.getValue().get(), (long)set.size())) badCacheEntries.put(key, set); @@ -102,8 +101,7 @@ public class IgniteAtomicInvokeRetryBenchmark extends IgniteFailoverAbstractBenc for (int k2 = 0; k2 < range; k2++) { String key2 = "key-" + k2; - asyncCache.get(key2); - Object val = asyncCache.future().get(timeout); + Object val = cache.getAsync(key2).get(timeout); if (val != null) println("Cache Entry [key=" + key2 + ", val=" + val + "]"); @@ -116,8 +114,7 @@ public class IgniteAtomicInvokeRetryBenchmark extends IgniteFailoverAbstractBenc println("Clearing all data."); - asyncCache.removeAll(); - asyncCache.future().get(timeout); + cache.removeAllAsync().get(timeout); nextValMap.clear(); @@ -166,8 +163,7 @@ public class IgniteAtomicInvokeRetryBenchmark extends IgniteFailoverAbstractBenc if (nextAtomicVal != null) nextVal = nextAtomicVal.incrementAndGet(); - asyncCache.invoke(key, new AddInSetEntryProcessor(), nextVal); - asyncCache.future().get(args.cacheOperationTimeoutMillis()); + cache.invokeAsync(key, new AddInSetEntryProcessor(), nextVal).get(args.cacheOperationTimeoutMillis()); } finally { rwl.readLock().unlock(); http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicRetriesBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicRetriesBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicRetriesBenchmark.java index 4e60698..0e99bbc 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicRetriesBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicRetriesBenchmark.java @@ -39,26 +39,22 @@ public class IgniteAtomicRetriesBenchmark extends IgniteFailoverAbstractBenchmar switch (opNum) { case 0: - asyncCache.get(key); - asyncCache.future().get(timeout); + cache.getAsync(key).get(timeout); break; case 1: - asyncCache.put(key, String.valueOf(key)); - asyncCache.future().get(timeout); + cache.putAsync(key, String.valueOf(key)).get(timeout); break; case 2: - asyncCache.invoke(key, new TestCacheEntryProcessor()); - asyncCache.future().get(timeout); + cache.invokeAsync(key, new TestCacheEntryProcessor()).get(timeout); break; case 3: - asyncCache.remove(key); - asyncCache.future().get(timeout); + cache.removeAsync(key).get(timeout); break; http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteFailoverAbstractBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteFailoverAbstractBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteFailoverAbstractBenchmark.java index 1a700c2..a025bb5 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteFailoverAbstractBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteFailoverAbstractBenchmark.java @@ -57,17 +57,12 @@ public abstract class IgniteFailoverAbstractBenchmark<K, V> extends IgniteCacheA /** */ private static final AtomicBoolean restarterStarted = new AtomicBoolean(); - /** Async Cache. */ - protected IgniteCache<K, V> asyncCache; - /** */ private final AtomicBoolean firtsExProcessed = new AtomicBoolean(); /** {@inheritDoc} */ @Override public void setUp(final BenchmarkConfiguration cfg) throws Exception { super.setUp(cfg); - - asyncCache = cache.withAsync(); } /** {@inheritDoc} */ @@ -116,11 +111,8 @@ public abstract class IgniteFailoverAbstractBenchmark<K, V> extends IgniteCacheA println("Waiting for partitioned map exchage of all nodes"); - IgniteCompute asyncCompute = ignite.compute().withAsync(); - - asyncCompute.broadcast(new AwaitPartitionMapExchangeTask()); - - asyncCompute.future().get(args.cacheOperationTimeoutMillis()); + ignite.compute().broadcastAsync(new AwaitPartitionMapExchangeTask()) + .get(args.cacheOperationTimeoutMillis()); println("Start servers restarting [numNodesToRestart=" + numNodesToRestart + ", shuffledIds=" + ids + "]"); @@ -242,10 +234,8 @@ public abstract class IgniteFailoverAbstractBenchmark<K, V> extends IgniteCacheA ClusterGroup srvs = ignite.cluster().forServers(); - IgniteCompute asyncCompute = ignite.compute(srvs).withAsync(); - - asyncCompute.broadcast(new ThreadDumpPrinterTask(ignite.cluster().localNode().id(), e)); - asyncCompute.future().get(10_000); + ignite.compute(srvs).broadcastAsync(new ThreadDumpPrinterTask(ignite.cluster().localNode().id(), e)) + .get(10_000); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalInvokeRetryBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalInvokeRetryBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalInvokeRetryBenchmark.java index b5a08da..2c4046e 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalInvokeRetryBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalInvokeRetryBenchmark.java @@ -79,8 +79,7 @@ public class IgniteTransactionalInvokeRetryBenchmark extends IgniteFailoverAbstr for (int i = 0; i < keysCnt; i++) { String key = "key-" + k + "-" + cfg.memberId() + "-" + i; - asyncCache.get(key); - Long cacheVal = asyncCache.<Long>future().get(timeout); + Long cacheVal = cache.getAsync(key).get(timeout); AtomicLong aVal = map.get(key); Long mapVal = aVal != null ? aVal.get() : null; @@ -114,8 +113,7 @@ public class IgniteTransactionalInvokeRetryBenchmark extends IgniteFailoverAbstr for (int i2 = 0; i2 < keysCnt; i2++) { String key2 = "key-" + k2 + "-" + cfg.memberId() + "-" + i2; - asyncCache.get(key2); - Long val = asyncCache.<Long>future().get(timeout); + Long val = cache.getAsync(key2).get(timeout); if (val != null) println(cfg, "Entry [key=" + key2 + ", val=" + val + "]"); @@ -169,8 +167,8 @@ public class IgniteTransactionalInvokeRetryBenchmark extends IgniteFailoverAbstr if (ex != null) throw ex; - asyncCache.invoke(key, new IncrementInvokeRetryCacheEntryProcessor()); - asyncCache.future().get(args.cacheOperationTimeoutMillis()); + cache.invokeAsync(key, new IncrementInvokeRetryCacheEntryProcessor()) + .get(args.cacheOperationTimeoutMillis()); AtomicLong prevVal = map.putIfAbsent(key, new AtomicLong(0)); http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java index 67044a1..46ebd8c 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteInvokeBenchmark.java @@ -128,14 +128,12 @@ public class IgniteTransactionalWriteInvokeBenchmark extends IgniteFailoverAbstr case 0: // Read scenario. Map<String, Long> map = new HashMap<>(); - asyncCache.get(masterKey); - Long cacheVal = asyncCache.<Long>future().get(timeout); + Long cacheVal = cache.getAsync(masterKey).get(timeout); map.put(masterKey, cacheVal); for (String key : keys) { - asyncCache.get(key); - cacheVal = asyncCache.<Long>future().get(timeout); + cacheVal = cache.getAsync(key).get(timeout); map.put(key, cacheVal); } @@ -147,18 +145,16 @@ public class IgniteTransactionalWriteInvokeBenchmark extends IgniteFailoverAbstr break; case 1: // Invoke scenario. - asyncCache.get(masterKey); - Long val = asyncCache.<Long>future().get(timeout); + Long val = cache.getAsync(masterKey).get(timeout); if (val == null) badKeys.add(masterKey); - asyncCache.put(masterKey, val == null ? -1 : val + 1); - asyncCache.future().get(timeout); + cache.putAsync(masterKey, val == null ? -1 : val + 1).get(timeout); for (String key : keys) { - asyncCache.invoke(key, new IncrementWriteInvokeCacheEntryProcessor(), cacheName()); - Object o = asyncCache.future().get(timeout); + Object o = cache.invokeAsync(key, + new IncrementWriteInvokeCacheEntryProcessor(), cacheName()).get(timeout); if (o != null) badKeys.add(key); http://git-wip-us.apache.org/repos/asf/ignite/blob/282b334f/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteReadBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteReadBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteReadBenchmark.java index c4314ed..ef88056 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteReadBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalWriteReadBenchmark.java @@ -54,8 +54,7 @@ public class IgniteTransactionalWriteReadBenchmark extends IgniteFailoverAbstrac final int timeout = args.cacheOperationTimeoutMillis(); for (String key : keys) { - asyncCache.get(key); - Long val = asyncCache.<Long>future().get(timeout); + Long val = cache.getAsync(key).get(timeout); map.put(key, val); } @@ -72,8 +71,7 @@ public class IgniteTransactionalWriteReadBenchmark extends IgniteFailoverAbstrac for (int i = 0; i < args.keysCount(); i++) { String key = "key-" + k + "-" + i; - asyncCache.get(key); - Long val = asyncCache.<Long>future().get(timeout); + Long val = cache.getAsync(key).get(timeout); if (val != null) println(cfg, "Entry [key=" + key + ", val=" + val + "]"); @@ -87,10 +85,8 @@ public class IgniteTransactionalWriteReadBenchmark extends IgniteFailoverAbstrac final Long newVal = oldVal == null ? 0 : oldVal + 1; - for (String key : keys) { - asyncCache.put(key, newVal); - asyncCache.future().get(timeout); - } + for (String key : keys) + cache.putAsync(key, newVal).get(timeout); return true; }
