ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: #ignite-sprint-4-tests: debug query tests.
Date Mon, 20 Apr 2015 18:06:32 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-sprint-4-tests cfb7241d6 -> 2d53eeace


#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/2d53eeac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2d53eeac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2d53eeac

Branch: refs/heads/ignite-sprint-4-tests
Commit: 2d53eeace197af95317aae0ed89418497b5ae7c6
Parents: cfb7241
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Mon Apr 20 20:59:41 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Mon Apr 20 20:59:41 2015 +0300

----------------------------------------------------------------------
 .../cache/distributed/dht/GridDhtLocalPartition.java           | 6 ++++--
 .../ignite/testsuites/IgniteCacheQuerySelfTestSuite.java       | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d53eeac/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 6836c2f..035d717 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,14 +222,16 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>
 
         // Make sure to remove exactly this entry.
         synchronized (entry) {
-            if (map.containsKey(entry.key()) && map.remove(entry.key(), entry) &&
!entry.isInternal()) {
+            if (map.containsKey(entry.key())
+                && map.remove(entry.key(), entry)
+                && !entry.isInternal()
+                && !entry.deleted()) {
                 System.out.println("DELETED ENTRY "  + entry.key().value(cctx.cacheObjectContext(),
true));
                 mapPubSize.decrement();
 
                 int l = mapPubSize.intValue();
                 if (l < 0) {
                     System.out.println("DELETED ENRTY TWO TIMES " + entry.key().value(cctx.cacheObjectContext(),
true));
-                    assert l >= 0;
                 }
             }
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d53eeac/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 88c2a3d..857d450 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
@@ -58,9 +58,9 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite {
         suite.addTestSuite(IgniteCacheCollocatedQuerySelfTest.class);
         suite.addTestSuite(IgniteCacheLargeResultSelfTest.class);
         suite.addTestSuite(GridCacheQueryInternalKeysSelfTest.class);*/
-        suite.addTestSuite(IgniteCacheQueryMultiThreadedSelfTest.class);
+        //suite.addTestSuite(IgniteCacheQueryMultiThreadedSelfTest.class);
         suite.addTestSuite(IgniteCacheQueryEvictsMultiThreadedSelfTest.class);
-        suite.addTestSuite(IgniteCacheQueryOffheapMultiThreadedSelfTest.class);
+        //suite.addTestSuite(IgniteCacheQueryOffheapMultiThreadedSelfTest.class);
         suite.addTestSuite(IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.class);
         /*suite.addTestSuite(IgniteCacheSqlQueryMultiThreadedSelfTest.class);
         suite.addTestSuite(IgniteCacheOffheapTieredMultithreadedSelfTest.class);


Mime
View raw message