Merge branch 'ignite-sprint-4' into ignite-gg-10115
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c214db15 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c214db15 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c214db15 Branch: refs/heads/ignite-gg-10115 Commit: c214db15d878eee8a216c3b8cd9a3225a9e04cc7 Parents: 6f172fa 7c9fab3 Author: Artem Shutak <ashu...@gridgain.com> Authored: Wed Apr 22 19:02:34 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Wed Apr 22 19:02:34 2015 +0300 ---------------------------------------------------------------------- .../examples/ScalarContinuationExample.scala | 10 +- .../apache/ignite/cache/CacheInterceptor.java | 9 +- .../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 + .../configuration/CacheConfiguration.java | 10 +- .../configuration/IgniteConfiguration.java | 107 +++++ .../ignite/internal/GridJobContextImpl.java | 100 +++-- .../org/apache/ignite/internal/IgnitionEx.java | 8 +- .../ignite/internal/MarshallerContextImpl.java | 2 +- .../managers/communication/GridIoManager.java | 33 +- .../GridLifecycleAwareMessageFilter.java | 35 ++ .../discovery/GridDiscoveryManager.java | 20 +- .../affinity/GridAffinityAssignmentCache.java | 7 +- .../cache/GridCacheEvictionManager.java | 11 +- .../dht/GridDhtAffinityAssignmentResponse.java | 21 +- .../distributed/dht/GridDhtTxFinishFuture.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../IgniteCacheObjectProcessorImpl.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 +- ...ridCachePartitionNotLoadedEventSelfTest.java | 22 +- .../IgniteCachePutGetRestartAbstractTest.java | 234 ++++++++++ .../IgniteCacheTxFairAffinityNodeJoinTest.java | 35 ++ ...iteCacheTxNearDisabledPutGetRestartTest.java | 30 ++ .../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 -- ...dCacheSortedBatchEvictionPolicySelfTest.java | 385 +++++++++++++++++ ...acheSortedEvictionPolicyPerformanceTest.java | 135 ++++++ .../GridCacheSortedEvictionPolicySelfTest.java | 373 ++++++++++++++++ .../testframework/junits/GridAbstractTest.java | 15 + .../IgniteCacheEvictionSelfTestSuite.java | 3 + .../IgniteCacheFailoverTestSuite.java | 3 + .../IgniteCacheFullApiSelfTestSuite.java | 9 +- .../ignite/util/TestTcpCommunicationSpi.java | 54 +++ .../IgniteCacheQueryMultiThreadedSelfTest.java | 4 + .../ignite/schema/generator/CodeGenerator.java | 60 ++- pom.xml | 14 +- 54 files changed, 2632 insertions(+), 167 deletions(-) ----------------------------------------------------------------------
