Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 988CE18ADE for ; Fri, 29 Jan 2016 12:47:08 +0000 (UTC) Received: (qmail 76186 invoked by uid 500); 29 Jan 2016 12:46:34 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 76144 invoked by uid 500); 29 Jan 2016 12:46:34 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 76134 invoked by uid 99); 29 Jan 2016 12:46:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Jan 2016 12:46:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0CF80E0A12; Fri, 29 Jan 2016 12:46:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: av@apache.org To: commits@ignite.apache.org Date: Fri, 29 Jan 2016 12:46:34 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] ignite git commit: 2224 Repository: ignite Updated Branches: refs/heads/ignite-2224 [created] b28f63e46 http://git-wip-us.apache.org/repos/asf/ignite/blob/b28f63e4/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 035f1b0..7286fb3 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 @@ -34,6 +34,7 @@ import javax.cache.processor.EntryProcessorResult; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteCompute; +import org.apache.ignite.cache.CacheEntry; import org.apache.ignite.cache.CacheEntryProcessor; import org.apache.ignite.cache.CacheMetrics; import org.apache.ignite.cache.CachePeekMode; @@ -129,7 +130,7 @@ public class IgniteCacheProcessProxy implements IgniteCache { } /** {@inheritDoc} */ - @Override public void loadCache(@Nullable IgniteBiPredicate p, @Nullable Object... args) + @Override public void loadCache(@Nullable IgniteBiPredicate p, @Nullable Object... args) throws CacheException { throw new UnsupportedOperationException("Method should be supported."); } @@ -224,11 +225,21 @@ public class IgniteCacheProcessProxy implements IgniteCache { } /** {@inheritDoc} */ + @Override public CacheEntry getEntry(K key) { + return compute.call(new GetEntryTask(cacheName, isAsync, key)); + } + + /** {@inheritDoc} */ @Override public Map getAll(Set keys) { return compute.call(new GetAllTask(cacheName, isAsync, keys)); } /** {@inheritDoc} */ + @Override public Collection> getEntries(Set keys) { + return compute.call(new GetEntriesTask(cacheName, isAsync, keys)); + } + + /** {@inheritDoc} */ @Override public Map getAllOutTx(Set keys) { return compute.call(new GetAllOutTxTask(cacheName, isAsync, keys)); } @@ -710,6 +721,29 @@ public class IgniteCacheProcessProxy implements IgniteCache { /** * */ + private static class GetEntryTask extends CacheTaskAdapter> { + /** Key. */ + private final K key; + + /** + * @param cacheName Cache name. + * @param async Async. + * @param key Key. + */ + public GetEntryTask(String cacheName, boolean async, K key) { + super(cacheName, async); + this.key = key; + } + + /** {@inheritDoc} */ + @Override public CacheEntry call() throws Exception { + return cache().getEntry(key); + } + } + + /** + * + */ private static class RemoveAllTask extends CacheTaskAdapter { /** * @param cacheName Cache name. @@ -973,6 +1007,29 @@ public class IgniteCacheProcessProxy implements IgniteCache { /** * */ + private static class GetEntriesTask extends CacheTaskAdapter> > { + /** Keys. */ + private final Set keys; + + /** + * @param cacheName Cache name. + * @param async Async. + * @param keys Keys. + */ + public GetEntriesTask(String cacheName, boolean async, Set keys) { + super(cacheName, async); + this.keys = keys; + } + + /** {@inheritDoc} */ + @Override public Collection> call() throws Exception { + return cache().getEntries(keys); + } + } + + /** + * + */ private static class GetAllOutTxTask extends CacheTaskAdapter> { /** Keys. */ private final Set keys; http://git-wip-us.apache.org/repos/asf/ignite/blob/b28f63e4/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java index 68e52df..45679dd 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java @@ -19,6 +19,12 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; import org.apache.ignite.cache.store.jdbc.CacheJdbcStoreSessionListenerSelfTest; +import org.apache.ignite.internal.processors.cache.CacheGetEntryOptimisticReadCommittedSeltTest; +import org.apache.ignite.internal.processors.cache.CacheGetEntryOptimisticRepeatableReadSeltTest; +import org.apache.ignite.internal.processors.cache.CacheGetEntryOptimisticSerializableSeltTest; +import org.apache.ignite.internal.processors.cache.CacheGetEntryPessimisticReadCommittedSeltTest; +import org.apache.ignite.internal.processors.cache.CacheGetEntryPessimisticRepeatableReadSeltTest; +import org.apache.ignite.internal.processors.cache.CacheGetEntryPessimisticSerializableSeltTest; import org.apache.ignite.internal.processors.cache.IgniteCacheGetCustomCollectionsSelfTest; import org.apache.ignite.internal.processors.GridCacheTxLoadFromStoreOnLockSelfTest; import org.apache.ignite.internal.processors.cache.CacheClientStoreSelfTest; @@ -241,6 +247,12 @@ public class IgniteCacheTestSuite4 extends TestSuite { suite.addTestSuite(IgniteSystemCacheOnClientTest.class); suite.addTestSuite(CacheRemoveAllSelfTest.class); + suite.addTestSuite(CacheGetEntryOptimisticReadCommittedSeltTest.class); + suite.addTestSuite(CacheGetEntryOptimisticRepeatableReadSeltTest.class); + suite.addTestSuite(CacheGetEntryOptimisticSerializableSeltTest.class); + suite.addTestSuite(CacheGetEntryPessimisticReadCommittedSeltTest.class); + suite.addTestSuite(CacheGetEntryPessimisticRepeatableReadSeltTest.class); + suite.addTestSuite(CacheGetEntryPessimisticSerializableSeltTest.class); suite.addTestSuite(CacheStopAndDestroySelfTest.class);