Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-748
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/476f3294 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/476f3294 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/476f3294 Branch: refs/heads/ignite-646 Commit: 476f3294b0cb1b7d02b34a56efc2598244ae627e Parents: 6d165b0 c6a70e7 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Apr 22 11:01:27 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Apr 22 11:01:27 2015 +0700 ---------------------------------------------------------------------- .../examples/ScalarContinuationExample.scala | 10 +- .../apache/ignite/cache/CacheInterceptor.java | 9 +- .../ignite/compute/ComputeJobContinuation.java | 2 + .../configuration/CacheConfiguration.java | 10 +- .../ignite/internal/GridJobContextImpl.java | 100 +++++++++----- .../ignite/internal/MarshallerContextImpl.java | 2 +- .../affinity/GridAffinityAssignmentCache.java | 7 +- .../cache/GridCacheEvictionManager.java | 11 +- .../dht/GridDhtAffinityAssignmentResponse.java | 21 ++- .../distributed/dht/GridDhtTxFinishFuture.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../processors/job/GridJobHoldListener.java | 6 +- .../processors/job/GridJobProcessor.java | 22 ++- .../internal/processors/job/GridJobWorker.java | 23 ++-- .../internal/GridContinuousTaskSelfTest.java | 114 ++++++++++++++++ .../GridDiscoveryManagerAliveCacheSelfTest.java | 6 +- ...ridCachePartitionNotLoadedEventSelfTest.java | 22 ++- .../IgniteCachePutGetRestartAbstractTest.java | 39 ++++-- .../IgniteCacheTxFairAffinityNodeJoinTest.java | 35 +++++ .../dht/GridCacheDhtPreloadSelfTest.java | 4 +- ...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 +++++ ...nlyFairAffinityMultiNodeFullApiSelfTest.java | 36 +++++ ...micFairAffinityMultiNodeFullApiSelfTest.java | 35 +++++ ...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 +++++ ...derFairAffinityMultiNodeFullApiSelfTest.java | 36 +++++ ...nlyFairAffinityMultiNodeFullApiSelfTest.java | 35 +++++ ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 1 + ...nedFairAffinityMultiNodeFullApiSelfTest.java | 37 +++++ ...dezvousAffinityMultiNodeFullApiSelfTest.java | 35 ----- ...acheSortedEvictionPolicyPerformanceTest.java | 136 +++++++++++++++++++ .../IgniteCacheFailoverTestSuite.java | 3 +- .../IgniteCacheFullApiSelfTestSuite.java | 9 +- .../ignite/util/TestTcpCommunicationSpi.java | 54 ++++++++ .../IgniteCacheQueryMultiThreadedSelfTest.java | 1 + 34 files changed, 812 insertions(+), 125 deletions(-) ----------------------------------------------------------------------
