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/0bd9052d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0bd9052d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0bd9052d Branch: refs/heads/ignite-80 Commit: 0bd9052d10547fc40b70ad0e42fd7613471dd383 Parents: f5c5cc9 4a7479f Author: sboikov <sboi...@gridgain.com> Authored: Wed Apr 22 16:57:27 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Apr 22 16:57:27 2015 +0300 ---------------------------------------------------------------------- .../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 +- .../managers/communication/GridIoManager.java | 33 ++++- .../GridLifecycleAwareMessageFilter.java | 35 +++++ .../discovery/GridDiscoveryManager.java | 18 ++- .../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 | 28 +++- .../internal/processors/job/GridJobWorker.java | 23 ++-- .../resources/META-INF/classnames.properties | 41 +++--- .../internal/GridContinuousTaskSelfTest.java | 114 ++++++++++++++++ .../GridDiscoveryManagerAliveCacheSelfTest.java | 6 +- .../dht/GridCacheDhtPreloadSelfTest.java | 4 +- ...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 +++++ ...nlyFairAffinityMultiNodeFullApiSelfTest.java | 36 +++++ ...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 +++++ ...derFairAffinityMultiNodeFullApiSelfTest.java | 36 +++++ ...nlyFairAffinityMultiNodeFullApiSelfTest.java | 35 +++++ ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 1 + ...nedFairAffinityMultiNodeFullApiSelfTest.java | 3 +- ...acheSortedEvictionPolicyPerformanceTest.java | 136 +++++++++++++++++++ .../testframework/junits/GridAbstractTest.java | 15 ++ .../IgniteCacheFullApiSelfTestSuite.java | 11 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 1 + .../ignite/schema/generator/CodeGenerator.java | 60 +++++++- 32 files changed, 774 insertions(+), 109 deletions(-) ----------------------------------------------------------------------
