Merge branch 'ignite-916' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ba6d0556 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ba6d0556 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ba6d0556 Branch: refs/heads/ignite-sprint-5 Commit: ba6d055640917ba904277b872196fe269fdd74c8 Parents: 1bd6da1 fbb5763 Author: agura <ag...@gridgain.com> Authored: Wed Jun 3 01:27:02 2015 +0300 Committer: agura <ag...@gridgain.com> Committed: Wed Jun 3 01:27:02 2015 +0300 ---------------------------------------------------------------------- .../ignite/cache/eviction/EvictableEntry.java | 7 + .../ignite/cache/eviction/EvictionPolicy.java | 2 + .../cache/eviction/fifo/FifoEvictionPolicy.java | 117 +- .../eviction/fifo/FifoEvictionPolicyMBean.java | 22 + .../cache/eviction/lru/LruEvictionPolicy.java | 135 ++- .../eviction/lru/LruEvictionPolicyMBean.java | 38 + .../eviction/random/RandomEvictionPolicy.java | 7 +- .../eviction/sorted/SortedEvictionPolicy.java | 141 ++- .../sorted/SortedEvictionPolicyMBean.java | 22 + .../cache/CacheEvictableEntryImpl.java | 31 + .../GridCacheConcurrentTxMultiNodeTest.java | 8 +- ...idCacheConfigurationConsistencySelfTest.java | 14 +- .../cache/GridCacheMemoryModeSelfTest.java | 23 +- .../processors/cache/GridCacheOffHeapTest.java | 5 +- .../cache/GridCacheReloadSelfTest.java | 6 +- .../cache/IgniteCachePeekModesAbstractTest.java | 5 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 11 +- .../dht/GridCacheDhtEvictionSelfTest.java | 11 +- .../dht/IgniteCacheMultiTxLockSelfTest.java | 6 +- .../GridCachePartitionedEvictionSelfTest.java | 11 +- ...ePartitionedMultiThreadedPutGetSelfTest.java | 6 +- .../cache/eviction/EvictionAbstractTest.java | 1056 ++++++++++++++++++ .../GridCacheBatchEvictUnswapSelfTest.java | 5 +- ...heConcurrentEvictionConsistencySelfTest.java | 82 +- .../GridCacheConcurrentEvictionsSelfTest.java | 29 +- .../GridCacheDistributedEvictionsSelfTest.java | 5 +- .../GridCacheEmptyEntriesAbstractSelfTest.java | 11 +- .../eviction/GridCacheEvictionAbstractTest.java | 484 -------- .../GridCacheEvictionTouchSelfTest.java | 22 +- .../cache/eviction/GridCacheMockEntry.java | 5 + .../fifo/FifoEvictionPolicySelfTest.java | 262 +++++ ...ridCacheFifoBatchEvictionPolicySelfTest.java | 384 ------- .../GridCacheFifoEvictionPolicySelfTest.java | 372 ------ .../lru/GridCacheLruEvictionPolicySelfTest.java | 417 ------- .../GridCacheLruNearEvictionPolicySelfTest.java | 136 --- ...heNearOnlyLruNearEvictionPolicySelfTest.java | 168 --- .../eviction/lru/LruEvictionPolicySelfTest.java | 353 ++++++ .../lru/LruNearEvictionPolicySelfTest.java | 140 +++ .../LruNearOnlyNearEvictionPolicySelfTest.java | 172 +++ .../GridCacheRandomEvictionPolicySelfTest.java | 258 ----- .../random/RandomEvictionPolicySelfTest.java | 357 ++++++ ...dCacheSortedBatchEvictionPolicySelfTest.java | 385 ------- ...acheSortedEvictionPolicyPerformanceTest.java | 135 --- .../GridCacheSortedEvictionPolicySelfTest.java | 373 ------- .../SortedEvictionPolicyPerformanceTest.java | 134 +++ .../sorted/SortedEvictionPolicySelfTest.java | 266 +++++ .../loadtests/GridCacheMultiNodeLoadTest.java | 5 +- .../GridCachePartitionedAtomicLongLoadTest.java | 6 +- .../swap/GridSwapEvictAllBenchmark.java | 6 +- .../IgniteCacheEvictionSelfTestSuite.java | 14 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 6 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 11 +- .../cache/ttl/CacheTtlAbstractSelfTest.java | 6 +- 53 files changed, 3465 insertions(+), 3228 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba6d0556/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/RandomEvictionPolicy.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/cache/eviction/random/RandomEvictionPolicy.java index 0ac9197,0d840e3..00a912f --- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/RandomEvictionPolicy.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/RandomEvictionPolicy.java @@@ -18,9 -18,7 +18,8 @@@ package org.apache.ignite.cache.eviction.random; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cache.eviction.*; - import org.apache.ignite.configuration.*; import org.apache.ignite.internal.util.typedef.internal.*; import javax.cache.*;
