Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-656
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8523ef83 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8523ef83 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8523ef83 Branch: refs/heads/ignite-286 Commit: 8523ef8394e45628d773a4a8a1f1d766031c5343 Parents: 1361d1c fddf2a3 Author: sboikov <sboi...@gridgain.com> Authored: Tue Apr 21 10:48:36 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Apr 21 10:48:36 2015 +0300 ---------------------------------------------------------------------- .../cache/eviction/fifo/FifoEvictionPolicy.java | 7 +- .../igfs/IgfsPerBlockLruEvictionPolicy.java | 3 +- .../cache/eviction/lru/LruEvictionPolicy.java | 5 +- .../eviction/sorted/SortedEvictionPolicy.java | 431 +++++++++++++++++++ .../sorted/SortedEvictionPolicyMBean.java | 66 +++ .../cache/eviction/sorted/package-info.java | 21 + .../discovery/GridDiscoveryManager.java | 2 +- ...dCacheSortedBatchEvictionPolicySelfTest.java | 385 +++++++++++++++++ .../GridCacheSortedEvictionPolicySelfTest.java | 373 ++++++++++++++++ .../IgniteCacheEvictionSelfTestSuite.java | 3 + .../IgniteCacheQueryMultiThreadedSelfTest.java | 3 + 11 files changed, 1290 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
