Repository: incubator-ignite Updated Branches: refs/heads/ignite-sprint-4-tests [created] d730e232b
#ignite-sprint-4-tests: debug query tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d730e232 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d730e232 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d730e232 Branch: refs/heads/ignite-sprint-4-tests Commit: d730e232be8f3e6b4c1fb8f0c652a3d4471358f1 Parents: d0e606f Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Apr 20 20:02:57 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Apr 20 20:02:57 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtLocalPartition.java | 8 ++++---- .../cache/IgniteCacheQueryMultiThreadedSelfTest.java | 1 + .../ignite/testsuites/IgniteCacheQuerySelfTestSuite.java | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d730e232/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java index c433698..24d702b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java @@ -222,10 +222,10 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition> // Make sure to remove exactly this entry. synchronized (entry) { - map.remove(entry.key(), entry); - - if (!entry.isInternal() && !entry.deleted()) - mapPubSize.decrement(); + if (map.containsKey(entry.key()) && map.remove(entry.key(), entry)) { + if (!entry.isInternal() && !entry.deleted()) + mapPubSize.decrement(); + } } // Attempt to evict. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d730e232/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java index 51fc92d..66e2470 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java @@ -193,6 +193,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes assertEquals("Swap keys: " + c.size(CachePeekMode.SWAP), 0, c.size(CachePeekMode.SWAP)); assertEquals(0, c.size(CachePeekMode.OFFHEAP)); + assertEquals(0, c.size(CachePeekMode.PRIMARY)); assertEquals(0, c.size()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d730e232/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java index 11baf8b..88c2a3d 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java @@ -39,7 +39,7 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite { public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("Ignite Cache Queries Test Suite"); - // Parsing + /* // Parsing suite.addTestSuite(GridQueryParsingTest.class); // Queries tests. @@ -57,12 +57,12 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite { suite.addTestSuite(IgniteCacheQueryIndexSelfTest.class); suite.addTestSuite(IgniteCacheCollocatedQuerySelfTest.class); suite.addTestSuite(IgniteCacheLargeResultSelfTest.class); - suite.addTestSuite(GridCacheQueryInternalKeysSelfTest.class); + suite.addTestSuite(GridCacheQueryInternalKeysSelfTest.class);*/ suite.addTestSuite(IgniteCacheQueryMultiThreadedSelfTest.class); suite.addTestSuite(IgniteCacheQueryEvictsMultiThreadedSelfTest.class); suite.addTestSuite(IgniteCacheQueryOffheapMultiThreadedSelfTest.class); suite.addTestSuite(IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.class); - suite.addTestSuite(IgniteCacheSqlQueryMultiThreadedSelfTest.class); + /*suite.addTestSuite(IgniteCacheSqlQueryMultiThreadedSelfTest.class); suite.addTestSuite(IgniteCacheOffheapTieredMultithreadedSelfTest.class); // suite.addTestSuite(IgniteCacheQueryNodeRestartSelfTest.class); TODO IGNITE-484 suite.addTestSuite(GridCacheReduceQueryMultithreadedSelfTest.class); @@ -110,7 +110,7 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite { suite.addTestSuite(H2CompareBigQueryTest.class); suite.addTestSuite(GridCacheQueryMetricsSelfTest.class); - +*/ return suite; } }
