Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-gg-9613
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/93da8b4b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/93da8b4b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/93da8b4b Branch: refs/heads/ignite-gg-9613 Commit: 93da8b4be472159bd41de27bb5c8b6d7fbd57bb9 Parents: c1d3ef9 8d13aa1 Author: ptupitsyn <[email protected]> Authored: Tue Apr 21 14:50:58 2015 +0300 Committer: ptupitsyn <[email protected]> Committed: Tue Apr 21 14:50:58 2015 +0300 ---------------------------------------------------------------------- .../examples/ScalarContinuationExample.scala | 10 +- .../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 + .../ignite/compute/ComputeJobContinuation.java | 2 + .../ignite/internal/GridJobContextImpl.java | 100 +++-- .../discovery/GridDiscoveryManager.java | 2 +- .../affinity/GridAffinityAssignmentCache.java | 7 +- .../processors/job/GridJobHoldListener.java | 6 +- .../processors/job/GridJobProcessor.java | 22 +- .../internal/processors/job/GridJobWorker.java | 23 +- .../internal/GridContinuousTaskSelfTest.java | 114 +++++ ...ridCachePartitionNotLoadedEventSelfTest.java | 22 +- .../IgniteCachePutGetRestartAbstractTest.java | 234 ++++++++++ .../IgniteCacheTxFairAffinityNodeJoinTest.java | 35 ++ ...iteCacheTxNearDisabledPutGetRestartTest.java | 30 ++ ...micFairAffinityMultiNodeFullApiSelfTest.java | 35 ++ ...nedFairAffinityMultiNodeFullApiSelfTest.java | 36 ++ ...dezvousAffinityMultiNodeFullApiSelfTest.java | 35 -- ...dCacheSortedBatchEvictionPolicySelfTest.java | 385 +++++++++++++++++ .../GridCacheSortedEvictionPolicySelfTest.java | 373 ++++++++++++++++ .../IgniteCacheEvictionSelfTestSuite.java | 3 + .../IgniteCacheFailoverTestSuite.java | 3 + .../IgniteCacheFullApiSelfTestSuite.java | 4 +- .../ignite/util/TestTcpCommunicationSpi.java | 54 +++ 28 files changed, 1965 insertions(+), 103 deletions(-) ----------------------------------------------------------------------
