Repository: incubator-ignite Updated Branches: refs/heads/ignite-sprint-4-tests 4c57b2217 -> 18c3d93bb
#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/18c3d93b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/18c3d93b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/18c3d93b Branch: refs/heads/ignite-sprint-4-tests Commit: 18c3d93bbeb4703319500d9be58c15ed6ef0affa Parents: 4c57b22 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Apr 21 10:56:17 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Apr 21 10:56:17 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCacheEvictionManager.java | 14 +++++++------- .../distributed/dht/GridDhtLocalPartition.java | 18 ++++++++++++++---- 2 files changed, 21 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18c3d93b/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 b0c9243..2009587 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 @@ -962,13 +962,6 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter { cctx.swap().writeAll(swapped); } finally { - // Unlock entries in reverse order. - for (ListIterator<GridCacheEntryEx> it = locked.listIterator(locked.size()); it.hasPrevious();) { - GridCacheEntryEx e = it.previous(); - - unsafe.monitorExit(e); - } - // Remove entries and fire events outside the locks. for (GridCacheEntryEx entry : locked) { if (entry.obsolete()) { @@ -984,6 +977,13 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter { EVT_CACHE_ENTRY_EVICTED, null, false, entry.rawGet(), entry.hasValue(), null, null, null); } } + + // Unlock entries in reverse order. + for (ListIterator<GridCacheEntryEx> it = locked.listIterator(locked.size()); it.hasPrevious();) { + GridCacheEntryEx e = it.previous(); + + unsafe.monitorExit(e); + } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18c3d93b/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 1ed71bb..3c1b8ec 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,7 +207,13 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition> assert state != EVICTED : "Adding entry to invalid partition: " + this; - if (map.put(entry.key(), entry) == null && !entry.isInternal()) + 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)); + } + + if (!entry.isInternal()) mapPubSize.increment(); } @@ -220,10 +226,14 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition> // Make sure to remove exactly this entry. synchronized (entry) { - if (map.remove(entry.key(), entry)) { - if (!entry.isInternal() && !entry.deleted()) - mapPubSize.decrement(); + 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)); } + + if (!entry.isInternal() && !entry.deleted()) + mapPubSize.decrement(); } // Attempt to evict.
