Repository: incubator-ignite Updated Branches: refs/heads/ignite-341-test [created] 74f099fcf
# ignite-341-test Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/74f099fc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/74f099fc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/74f099fc Branch: refs/heads/ignite-341-test Commit: 74f099fcf2a96fa076b4d627ad4efe2a7166b4aa Parents: 23d965f Author: sboikov <sboi...@gridgain.com> Authored: Thu Mar 26 12:22:00 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Mar 26 12:22:00 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCacheEvictionManager.java | 31 +++++++++++ .../IgniteCacheQuerySelfTestSuite.java | 56 -------------------- 2 files changed, 31 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/74f099fc/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 fd56568..6314342 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 @@ -917,6 +917,36 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter { assert !evictSyncAgr; assert cctx.isSwapOrOffheapEnabled(); + GridCacheAdapter cache = cctx.cache(); + + boolean recordable = cctx.events().isRecordable(EVT_CACHE_ENTRY_EVICTED); + + for (Object k : keys) { + KeyCacheObject cacheKey = cctx.toCacheKeyObject(k); + + GridCacheEntryEx e = cache.peekEx(cacheKey); + + if (e != null) { + if (obsoleteVer == null) + obsoleteVer = cctx.versions().next(); + + e.evictInternal(true, obsoleteVer, null); + + if (e.obsolete()) { + e.onMarkedObsolete(); + + cache.removeEntry(e); + + if (plcEnabled) + notifyPolicy(e); + + if (recordable) + cctx.events().addEvent(e.partition(), e.key(), cctx.nodeId(), (IgniteUuid)null, null, + EVT_CACHE_ENTRY_EVICTED, null, false, e.rawGet(), e.hasValue(), null, null, null); + } + } + } + /* List<GridCacheEntryEx> locked = new ArrayList<>(keys.size()); Collection<GridCacheBatchSwapEntry> swapped = new ArrayList<>(keys.size()); @@ -989,6 +1019,7 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter { } } } + */ } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/74f099fc/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 e3926f3..5484e45 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,66 +39,10 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite { public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("Ignite Cache Queries Test Suite"); - // Parsing - suite.addTestSuite(GridQueryParsingTest.class); - - // Queries tests. - suite.addTestSuite(GridCacheQueryIndexDisabledSelfTest.class); - suite.addTestSuite(IgniteCacheQueryLoadSelfTest.class); - suite.addTestSuite(IgniteCacheLocalQuerySelfTest.class); - suite.addTestSuite(IgniteCacheLocalAtomicQuerySelfTest.class); - suite.addTestSuite(IgniteCacheReplicatedQuerySelfTest.class); - suite.addTestSuite(IgniteCacheReplicatedQueryP2PDisabledSelfTest.class); - suite.addTestSuite(IgniteCachePartitionedQuerySelfTest.class); - suite.addTestSuite(IgniteCacheAtomicQuerySelfTest.class); - suite.addTestSuite(IgniteCacheAtomicNearEnabledQuerySelfTest.class); - suite.addTestSuite(IgniteCachePartitionedQueryP2PDisabledSelfTest.class); - suite.addTestSuite(IgniteCachePartitionedQueryMultiThreadedSelfTest.class); - suite.addTestSuite(IgniteCacheQueryIndexSelfTest.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(IgniteCacheQueryNodeRestartSelfTest.class); TODO IGNITE-484 - suite.addTestSuite(GridCacheReduceQueryMultithreadedSelfTest.class); - suite.addTestSuite(GridCacheCrossCacheQuerySelfTest.class); - - // Fields queries. - suite.addTestSuite(IgniteCacheLocalFieldsQuerySelfTest.class); - suite.addTestSuite(IgniteCacheReplicatedFieldsQuerySelfTest.class); - suite.addTestSuite(IgniteCacheReplicatedFieldsQueryP2PDisabledSelfTest.class); - suite.addTestSuite(IgniteCachePartitionedFieldsQuerySelfTest.class); - suite.addTestSuite(IgniteCacheAtomicFieldsQuerySelfTest.class); - suite.addTestSuite(IgniteCacheAtomicNearEnabledFieldsQuerySelfTest.class); - suite.addTestSuite(IgniteCachePartitionedFieldsQueryP2PDisabledSelfTest.class); - suite.addTestSuite(IgniteCacheFieldsQueryNoDataSelfTest.class); - - // Continuous queries. - suite.addTestSuite(GridCacheContinuousQueryLocalSelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryLocalAtomicSelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryReplicatedSelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryReplicatedAtomicSelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryReplicatedP2PDisabledSelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryPartitionedSelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryPartitionedOnlySelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryPartitionedP2PDisabledSelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryAtomicSelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryAtomicNearEnabledSelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryAtomicP2PDisabledSelfTest.class); - - // Reduce fields queries. - suite.addTestSuite(GridCacheReduceFieldsQueryLocalSelfTest.class); - suite.addTestSuite(GridCacheReduceFieldsQueryPartitionedSelfTest.class); - suite.addTestSuite(GridCacheReduceFieldsQueryAtomicSelfTest.class); - suite.addTestSuite(GridCacheReduceFieldsQueryReplicatedSelfTest.class); - - suite.addTestSuite(GridCacheQueryIndexingDisabledSelfTest.class); - - suite.addTestSuite(GridCacheSwapScanQuerySelfTest.class); - - suite.addTestSuite(GridOrderedMessageCancelSelfTest.class); return suite; }
