Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6c4bad17 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6c4bad17 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6c4bad17 Branch: refs/heads/ignite-2542 Commit: 6c4bad1758d7ff963a3bc1830d910732edd7db0b Parents: 159b6cb 57236c6 Author: vozerov-gridgain <[email protected]> Authored: Fri Feb 12 16:03:06 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Fri Feb 12 16:03:06 2016 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/CacheMemoryMode.java | 2 + .../internal/GridMessageListenHandler.java | 16 ++ .../processors/cache/GridCacheAdapter.java | 7 + .../processors/cache/GridCacheProcessor.java | 8 +- .../processors/cache/GridCacheSwapManager.java | 3 +- .../continuous/GridContinuousProcessor.java | 50 +++-- .../internal/GridAffinityNoCacheSelfTest.java | 4 +- ...eClientReconnectContinuousProcessorTest.java | 32 +++- .../GridCacheOffHeapValuesEvictionSelfTest.java | 17 +- .../GridCacheReplicatedPreloadSelfTest.java | 121 +++++++++--- ...IgniteCacheContinuousQueryReconnectTest.java | 192 +++++++++++++++++++ .../tcp/TcpClientDiscoverySpiSelfTest.java | 2 +- .../p2p/CacheDeploymentAffinityKeyMapper.java | 35 ++++ .../CacheDeploymentAlwaysTruePredicate2.java | 30 +++ ...oymentCacheEntryEventSerializableFilter.java | 32 ++++ .../p2p/CacheDeploymentCacheEntryListener.java | 31 +++ ...CacheDeploymentCachePluginConfiguration.java | 74 +++++++ ...heDeploymentStoreSessionListenerFactory.java | 83 ++++++++ .../IgniteCacheQuerySelfTestSuite.java | 2 + .../yardstick/cache/IgniteInvokeBenchmark.java | 65 +++++++ .../cache/IgniteInvokeTxBenchmark.java | 30 +++ 21 files changed, 786 insertions(+), 50 deletions(-) ----------------------------------------------------------------------
