Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-446
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b69f37a0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b69f37a0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b69f37a0 Branch: refs/heads/ignite-471 Commit: b69f37a04ec9c08ec2e784919399f6195ac3d84b Parents: a636440 8e31b7c Author: Anton Vinogradov <avinogra...@gridgain.com> Authored: Wed Apr 22 21:40:40 2015 +0300 Committer: Anton Vinogradov <avinogra...@gridgain.com> Committed: Wed Apr 22 21:40:40 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/CacheInterceptor.java | 9 +- .../configuration/CacheConfiguration.java | 10 +- .../configuration/IgniteConfiguration.java | 107 +++++++++++++++ .../org/apache/ignite/internal/IgnitionEx.java | 8 +- .../ignite/internal/MarshallerContextImpl.java | 2 +- .../connection/GridClientNioTcpConnection.java | 9 +- .../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 +- .../IgniteCacheObjectProcessorImpl.java | 2 +- .../processors/job/GridJobProcessor.java | 6 + .../resources/META-INF/classnames.properties | 41 +++--- .../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 | 135 +++++++++++++++++++ .../testframework/junits/GridAbstractTest.java | 15 +++ .../IgniteCacheFullApiSelfTestSuite.java | 11 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 1 + .../ignite/schema/generator/CodeGenerator.java | 60 ++++++++- pom.xml | 14 +- 31 files changed, 675 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b69f37a0/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ----------------------------------------------------------------------
