#ignite-286:wip
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e174c0bc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e174c0bc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e174c0bc Branch: refs/heads/ignite-286 Commit: e174c0bcb302359f3019c8fea7953f5005fd5ce2 Parents: 13c8296 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Apr 24 17:43:44 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Apr 24 17:43:44 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/local/GridLocalCache.java | 2 -- .../local/atomic/GridLocalAtomicCache.java | 2 -- .../cache/query/GridCacheQueryManager.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 21 +++++++++----------- .../IgniteCacheFullApiSelfTestSuite.java | 8 ++++---- 5 files changed, 14 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e174c0bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java index 90b979b..8553b86 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.local; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.affinity.*; import org.apache.ignite.internal.processors.cache.*; @@ -30,7 +29,6 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; -import javax.cache.*; import java.io.*; import java.util.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e174c0bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java index 8799690..672f12d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.local.atomic; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.affinity.*; import org.apache.ignite.internal.processors.cache.*; @@ -35,7 +34,6 @@ import org.apache.ignite.plugin.security.*; import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; -import javax.cache.*; import javax.cache.expiry.*; import javax.cache.processor.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e174c0bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java index 940a6b3..20cf915 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java @@ -2497,7 +2497,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * @param keepPortable Keep portable flag. */ private OffheapIteratorClosure( - IgniteBiPredicate<K, V> filter, + @Nullable IgniteBiPredicate<K, V> filter, boolean keepPortable) { assert filter != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e174c0bc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index aa00a49..432609e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -3670,11 +3670,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract CU.inTx(ignite(0), jcache(), concurrency, isolation, new CIX1<IgniteCache<String, Integer>>() { @Override public void applyx(IgniteCache<String, Integer> cache) { - for (int i = 0; i < cnt; i++) { - System.out.println("i " + i); + for (int i = 0; i < cnt; i++) assertTrue(cache.remove("key" + i)); - } - } }); @@ -3684,7 +3681,6 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertNull(cache.get("key" + i)); } }); - } } @@ -4002,7 +3998,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract iter.remove(); GridTestUtils.assertThrows(log, new Callable<Object>() { - @Override public Void call() throws Exception { + @Override + public Void call() throws Exception { iter.remove(); return null; @@ -4585,17 +4582,17 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (int i = 0; i < keys.size(); i++) data.put(keys.get(i), i); - checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, OPTIMISTIC, READ_COMMITTED); + /* checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, OPTIMISTIC, READ_COMMITTED); checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, OPTIMISTIC, REPEATABLE_READ); - checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, OPTIMISTIC, SERIALIZABLE); + checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, OPTIMISTIC, SERIALIZABLE);*/ - //checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, PESSIMISTIC, READ_COMMITTED); - - //checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, PESSIMISTIC, REPEATABLE_READ); + checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, PESSIMISTIC, READ_COMMITTED); +/* + checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, PESSIMISTIC, REPEATABLE_READ); - checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, PESSIMISTIC, SERIALIZABLE); + checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, PESSIMISTIC, SERIALIZABLE);*/ } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e174c0bc/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java index 5c2b77f..85bffee 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java @@ -34,7 +34,7 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite { public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("Cache Full API Test Suite"); - // One node. + /* // One node. suite.addTestSuite(GridCacheLocalFullApiSelfTest.class); suite.addTestSuite(GridCacheLocalAtomicFullApiSelfTest.class); suite.addTestSuite(GridCacheReplicatedFullApiSelfTest.class); @@ -119,7 +119,7 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite { suite.addTestSuite(GridCachePartitionedOffHeapMultiNodeFullApiSelfTest.class); suite.addTestSuite(GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.class); suite.addTestSuite(GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest.class); - suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapMultiNodeFullApiSelfTest.class); + suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapMultiNodeFullApiSelfTest.class);*/ // Multi-node with off-heap tiered mode. suite.addTestSuite(GridCacheReplicatedOffHeapTieredMultiNodeFullApiSelfTest.class); @@ -127,12 +127,12 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite { suite.addTestSuite(GridCacheAtomicOffHeapTieredMultiNodeFullApiSelfTest.class); suite.addTestSuite(GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiNodeFullApiSelfTest.class); suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapTieredMultiNodeFullApiSelfTest.class); - +/* // Private cache API. suite.addTestSuite(GridCacheExLocalFullApiSelfTest.class); suite.addTestSuite(GridCacheExReplicatedFullApiSelfTest.class); suite.addTestSuite(GridCacheExNearFullApiSelfTest.class); - suite.addTestSuite(GridCacheExColocatedFullApiSelfTest.class); + suite.addTestSuite(GridCacheExColocatedFullApiSelfTest.class);*/ // Multithreaded // TODO: GG-708 // suite.addTestSuite(GridCacheLocalFullApiMultithreadedSelfTest.class);
