Repository: incubator-ignite Updated Branches: refs/heads/ignite-sprint-4-tests b1db63542 -> c769a9fa9
#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/c769a9fa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c769a9fa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c769a9fa Branch: refs/heads/ignite-sprint-4-tests Commit: c769a9fa91bd4397d666f29fb975125a6e6c3a6f Parents: b1db635 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Apr 21 11:19:50 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Apr 21 11:19:50 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheEvictionManager.java | 3 +-- .../cache/distributed/dht/GridDhtLocalPartition.java | 12 ++---------- 2 files changed, 3 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c769a9fa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java index 1762ccc..826eb1b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java @@ -946,9 +946,8 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter { locked.add(entry); - if (!entry.obsolete()) { + if (!entry.obsolete()) toRemove.add(entry); - } if (obsoleteVer == null) obsoleteVer = cctx.versions().next(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c769a9fa/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 3c1b8ec..c433698 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 @@ -207,11 +207,7 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition> assert state != EVICTED : "Adding entry to invalid partition: " + this; - if (map.put(entry.key(), entry) == null && !entry.isInternal()) { - System.out.println("??????????????????????? entry puted first time " + entry.key().value(cctx.cacheObjectContext(), true)); - } else if (!entry.isInternal()) { - System.out.println("!!!!!!!!!!!!!!!!!!!!!!! entry puted two times " + entry.key().value(cctx.cacheObjectContext(), true)); - } + map.put(entry.key(), entry); if (!entry.isInternal()) mapPubSize.increment(); @@ -226,11 +222,7 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition> // Make sure to remove exactly this entry. synchronized (entry) { - if (map.remove(entry.key(), entry) && !entry.isInternal() && !entry.deleted()) { - System.out.println("??????????????????????? entry deleted first time " + entry.key().value(cctx.cacheObjectContext(), true)); - } else if (!entry.isInternal() && !entry.deleted()) { - System.out.println("!!!!!!!!!!!!!!!!!!!!!!! entry deleted two times " + entry.key().value(cctx.cacheObjectContext(), true)); - } + map.remove(entry.key(), entry); if (!entry.isInternal() && !entry.deleted()) mapPubSize.decrement();
